Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Issue 1653: Using Search Box causes crash

Browse Source
This commit is contained in:
Inusaito Sayori
2014-09-04 17:31:11 -04:00
committed by Shyotl
parent 1608ed43c1
commit c7db5122c8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterdirectory.cpp
View File

@@ -455,13 +455,13 @@ void LLFloaterDirectory::requestClassifieds()
void LLFloaterDirectory::searchInAll(const std::string& search_text) void LLFloaterDirectory::searchInAll(const std::string& search_text)
{ {
start();
LLPanelDirFindAllInterface::search(sInstance->mFindAllPanel, search_text); LLPanelDirFindAllInterface::search(sInstance->mFindAllPanel, search_text);
performQueryOn2("classified_panel", search_text); performQueryOn2("classified_panel", search_text);
performQueryOn2("events_panel", search_text); performQueryOn2("events_panel", search_text);
performQueryOn2("groups_panel", search_text); performQueryOn2("groups_panel", search_text);
performQueryOn2("people_panel", search_text); performQueryOn2("people_panel", search_text);
performQueryOn2("places_panel", search_text); performQueryOn2("places_panel", search_text);
sInstance->open();
} }
void LLFloaterDirectory::showFindAll(const std::string& search_text) void LLFloaterDirectory::showFindAll(const std::string& search_text)
@@ -583,7 +583,7 @@ void LLFloaterDirectory::focusCurrentPanel()
} }
// static // static
void LLFloaterDirectory::showPanel(const std::string& tabname) void LLFloaterDirectory::start()
{ {
// This function gets called when web browser clicks are processed, // This function gets called when web browser clicks are processed,
// so we don't delete the existing panel, which would delete the // so we don't delete the existing panel, which would delete the
@@ -593,6 +593,12 @@ void LLFloaterDirectory::showPanel(const std::string& tabname)
sInstance = new LLFloaterDirectory("directory"); sInstance = new LLFloaterDirectory("directory");
} }
sInstance->open(); /*Flawfinder: ignore*/ sInstance->open(); /*Flawfinder: ignore*/
}
// static
void LLFloaterDirectory::showPanel(const std::string& tabname)
{
start();
sInstance->childShowTab("Directory Tabs", tabname); sInstance->childShowTab("Directory Tabs", tabname);
sInstance->focusCurrentPanel(); sInstance->focusCurrentPanel();
} }

1
indra/newview/llfloaterdirectory.h
View File

@@ -94,6 +94,7 @@ public:
private: private:
static void performQueryOn(const std::string& name, const std::string& search_text); static void performQueryOn(const std::string& name, const std::string& search_text);
static void performQueryOn2(const std::string& name, const std::string& search_text); static void performQueryOn2(const std::string& name, const std::string& search_text);
static void start();
static void showPanel(const std::string& tabname); static void showPanel(const std::string& tabname);
/*virtual*/ void onClose(bool app_quitting); /*virtual*/ void onClose(bool app_quitting);
void focusCurrentPanel(); void focusCurrentPanel();