svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release

Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index e97aead955..32501b4642 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -101,6 +101,8 @@ public:
     const std::vector<std::string>& getLoginURIs() const;
     const std::string& getHelperURI() const;
     void resetURIs() const;
+    void setLoginPage(const std::string& login_page);
+    const std::string& getLoginPage();
 
     void forceDisconnect(const LLString& msg); // Force disconnection, with a message to the user.
     void badNetworkHandler(); // Cause a crash state due to bad network packet.
@@ -111,6 +113,8 @@ public:
     void loadNameCache();
     void saveNameCache();
 
+    bool isInProductionGrid();
+
     // LLAppViewer testing helpers.
     // *NOTE: These will potentially crash the viewer. Only for debugging.
     virtual void forceErrorLLError();
@@ -169,7 +173,7 @@ private:
 	// Thread objects.
 	static LLTextureCache* sTextureCache; 
 	static LLWorkerThread* sImageDecodeThread; 
-	static LLTextureFetch* sTextureFetch; 
+	static LLTextureFetch* sTextureFetch;
 
 	S32 mNumSessions;
 
@@ -196,7 +200,6 @@ extern BOOL gHandleKeysAsync; // gSavedSettings used by llviewerdisplay.cpp & ll
 extern BOOL gProbeHardware;
 extern LLString gDisabledMessage; // llstartup
 extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup
-extern BOOL gInProductionGrid; 
 extern LLSD gDebugInfo;
 
 extern BOOL	gAllowIdleAFK;