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

Groundwork for Legacy Search "killswitch"

Cinders 2013-03-11 23:56:44 -06:00
parent 0927d82fe5
commit 54e4b67d8b
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsdata.h
View File

@ -85,6 +85,8 @@ public:
FSDataAgent* getAgent(LLUUID avatar_id);
LLSD allowed_login();
static bool enableLegacySearch() {return false;}
std::string processRequestForInfo(LLUUID requester,std::string message, std::string name, LLUUID sessionid);
static LLSD getSystemInfo();

21
indra/newview/llstartup.cpp
View File

@ -214,6 +214,7 @@
#include "fsfloatersearch.h"
#include "fslslbridge.h"
#include "fswsassetblacklist.h"
#include "llfloatersearch.h"
#include "llfloatersidepanelcontainer.h"
#include "llnotificationmanager.h"
#include "NACLantispam.h"
@ -3947,7 +3948,25 @@ bool process_login_success_response(U32 &first_sim_size_x, U32 &first_sim_size_y
LL_DEBUGS("OS_SETTINGS") << "no destination_guide_url in login response" << llendl;
}
// </FS:AW opensim destinations and avatar picker>
#endif // OPENSIM // <FS:AW optional opensim support>
// <FS:CR> Legacy search killswitch!
if (!LLGridManager::getInstance()->isInOpenSim())
#endif // OPENSIM
{
if (FSData::enableLegacySearch())
{
LLFloaterReg::add("search", "floater_fs_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterSearch>);
}
else
{
LLFloaterReg::add("search", "floater_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSearch>);
}
}
else
{
LLFloaterReg::add("search", "floater_fs_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterSearch>);
}
// </FS:CR>
bool success = false;
// JC: gesture loading done below, when we have an asset system

3
indra/newview/llviewerfloaterreg.cpp
View File

@ -339,7 +339,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("start_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterRunQueue>);
LLFloaterReg::add("stop_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotRunQueue>);
LLFloaterReg::add("snapshot", "floater_snapshot.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSnapshot>);
// <FS:CR> Replacing LL search with Firestorm Search below
// <FS:CR> Search floater is deferred to login now so we can tell what grid we're in.
//LLFloaterReg::add("search", "floater_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSearch>);
LLFloaterReg::add("my_profile", "floater_my_web_profile.xml", (LLFloaterBuildFunc)&LLFloaterWebProfile::create);
LLFloaterReg::add("profile", "floater_web_profile.xml", (LLFloaterBuildFunc)&LLFloaterWebProfile::create);
@ -386,7 +386,6 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("phototools_camera", "floater_phototools_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
LLFloaterReg::add("publish_classified_fs", "floater_publish_classified.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSPublishClassifiedFloater>);
LLFloaterReg::add("quickprefs", "floater_quickprefs.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FloaterQuickPrefs>);
LLFloaterReg::add("search", "floater_fs_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterSearch>);
LLFloaterReg::add("search_replace", "floater_search_replace.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSearchReplace>);
LLFloaterReg::add("secondary_inventory", "floater_my_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("script_recover", "floater_script_recover.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptRecover>);