Merge pull request #83 from AyaneStorm/pr-Fire-35185-link-rendering-i…

…n-pick-and-1stlife [FIRE-35185] Profile preview removing embedded URLs from 1st Life tab
FirestormViewer · Feb 25, 2025 · e132dd4 · e132dd4
2 parents 33d1961 + 538dcb0
commit e132dd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
@@ -2770,6 +2770,7 @@ void LLPanelProfileFirstLife::onOpen(const LLSD& key)
         mDescriptionEdit->setTabStop(false);
     }
     mPreviewButton->setVisible(getSelfProfile()); // <AS:Chanayane> Preview button
+    mDescriptionEdit->setParseHTML(!getSelfProfile()); // <AS:Chanayane> Fix FIRE-35185 (disables link rendering while editing picks or 1st life)
 
     // <FS:Zi> Allow proper texture swatch handling
     mPicture->setEnabled(getSelfProfile());

diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
@@ -712,7 +712,10 @@ void LLPanelProfilePick::processProperties(void* data, EAvatarProcessorType type
 void LLPanelProfilePick::processProperties(const LLPickData* pick_info)
 {
     mIsEditing = false;
-    mPickDescription->setParseHTML(true);
+    // <AS:Chanayane> Fix FIRE-35185 (disables link rendering while editing picks or 1st life)
+    //mPickDescription->setParseHTML(true);
+    mPickDescription->setParseHTML(!getSelfProfile());
+    // </AS:Chanayane>
     mParcelId = pick_info->parcel_id;
     setSnapshotId(pick_info->snapshot_id);
     if (!getSelfProfile())