diff options
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llviewerhelputil.cpp | 19 | ||||
-rw-r--r-- | indra/newview/llviewerhome.cpp | 2 |
2 files changed, 7 insertions, 14 deletions
diff --git a/indra/newview/llviewerhelputil.cpp b/indra/newview/llviewerhelputil.cpp index 2642b2378e..0a03012af6 100644 --- a/indra/newview/llviewerhelputil.cpp +++ b/indra/newview/llviewerhelputil.cpp @@ -32,23 +32,14 @@ */ #include "llviewerprecompiledheaders.h" +#include "llviewerhelputil.h" -#include "llversionviewer.h" -#include "llviewerversion.h" - -//#include "llfloaterhelpbrowser.h" -//#include "llfloaterreg.h" -//#include "llfocusmgr.h" -//#include "llviewercontrol.h" -//#include "llappviewer.h" - +#include "llcontrol.h" #include "llstring.h" -#include "lluri.h" #include "llsys.h" - -#include "llcontrol.h" - -#include "llviewerhelputil.h" +#include "lluri.h" +#include "llversionviewer.h" +#include "llviewerversion.h" ////////////////////////////////////////////// diff --git a/indra/newview/llviewerhome.cpp b/indra/newview/llviewerhome.cpp index ee1e46dc59..4556c3c5b1 100644 --- a/indra/newview/llviewerhome.cpp +++ b/indra/newview/llviewerhome.cpp @@ -40,6 +40,7 @@ #include "llsd.h" #include "llviewerversion.h" #include "llviewercontrol.h" +#include "llviewernetwork.h" //static std::string LLViewerHome::getHomeURL() @@ -52,6 +53,7 @@ std::string LLViewerHome::getHomeURL() substitution["CHANNEL"] = LLURI::escape(gSavedSettings.getString("VersionChannelName")); substitution["LANGUAGE"] = LLUI::getLanguage(); substitution["AUTH_KEY"] = LLURI::escape(getAuthKey()); + substitution["GRID"] = LLViewerLogin::getInstance()->getGridLabel(); std::string homeURL = gSavedSettings.getString("HomeSidePanelURL"); LLStringUtil::format(homeURL, substitution); |