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

Feature Request: Web Search Tab in Legacy Search!

Browse Source
This commit is contained in:
Lirusaito
2013-07-03 05:44:48 -04:00
parent 27145699bf
commit d623fd37cc
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloaterdirectory.cpp
View File

@@ -161,6 +161,20 @@ private:
std::string mMarketplaceURL;
};
static void* createWebPanel(void* data)
{
struct LLPanelDirWeb : public LLPanelDirFind
{
LLPanelDirWeb(LLFloaterDirectory* f) : LLPanelDirFind("web_panel", f, "web_search_browser") {}
/*virtual*/ void search(const std::string& url) {}
/*virtual*/ void navigateToDefaultPage()
{
if (mWebBrowser) mWebBrowser->navigateTo(getString("default_search_page"));
}
};
return new LLPanelDirWeb(static_cast<LLFloaterDirectory*>(data));
}
LLFloaterDirectory* LLFloaterDirectory::sInstance = NULL;
//static
S32 LLFloaterDirectory::sOldSearchCount = 0; // debug
@@ -205,6 +219,7 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
// web search and showcase only for SecondLife
factory_map["find_all_panel"] = LLCallbackMap(createFindAll, this);
factory_map["showcase_panel"] = LLCallbackMap(createShowcase, this);
if (!enableClassicAllSearch) factory_map["web_panel"] = LLCallbackMap(createWebPanel, this);
}
if (enableClassicAllSearch)