livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in legacy search

meow-7.2.2
Ansariel 2022-04-20 15:57:09 +02:00
parent f999ed25ef
commit a2742afe99
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/fsfloatersearch.cpp
View File

@ -344,12 +344,7 @@ void FSFloaterSearch::onTabChange()
mDetailsPanel->setVisible(false);
mPanelWeb->resetFocusOnLoad();
}
// <KC> If on legacy people search and skin uses full profile preview, hide preview panel
else if (active_panel == mPanelPeople && mPanelProfile)
{
mDetailsPanel->setVisible(false);
}
else
else if (active_panel == mPanelPeople)
{
mDetailsPanel->setVisible(mHasSelection);
}
@ -392,19 +387,8 @@ void FSFloaterSearch::onSelectedItem(const LLUUID& selected_item, ESearchCategor
switch (type)
{
case SC_AVATAR:
{
// <KC> If skin has legacy full profile view, use it
if (mPanelProfile)
{
mPanelProfile->setVisible(true);
mPanelProfile->onOpen(LLSD().with("id", selected_item));
}
else
{
LLAvatarPropertiesProcessor::getInstance()->addObserver(selected_item, mAvatarPropertiesObserver);
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(selected_item);
}
}
LLAvatarPropertiesProcessor::getInstance()->addObserver(selected_item, mAvatarPropertiesObserver);
LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(selected_item);
break;
case SC_GROUP:
mGroupPropertiesRequest = new FSSearchGroupInfoObserver(selected_item, this);

1
indra/newview/fsfloatersearch.h
View File

@ -412,7 +412,6 @@ private:
LLTextureCtrl* mDetailSnapshotParcel;
LLIconCtrl* mDetailMaturity;
LLTabContainer* mTabContainer;
LLPanelProfile* mPanelProfile;
};
#endif // FS_FLOATERSEARCH_H