Skip to content

Commit

Permalink
Fix FIRE-35185 (disables link rendering while editing picks or 1st life)
Browse files Browse the repository at this point in the history
  • Loading branch information
chanayane committed Feb 23, 2025
1 parent 33d1961 commit 538dcb0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions indra/newview/llpanelprofile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
5 changes: 4 additions & 1 deletion indra/newview/llpanelprofilepicks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit 538dcb0

Please sign in to comment.