aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:23 -0500
committerJacek Antonelli2008-08-15 23:45:23 -0500
commit486c4774ab4a707d69c1b48cdc048af1369084db (patch)
tree2a206a7e32a9a7efb98d585798a9fa18baeaf171 /linden/indra/newview/llappviewer.h
parentSecond Life viewer sources 1.18.6.1-RC (diff)
downloadmeta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.zip
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.gz
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.bz2
meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.xz
Second Life viewer sources 1.18.6.2-RC
Diffstat (limited to 'linden/indra/newview/llappviewer.h')
-rw-r--r--linden/indra/newview/llappviewer.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index e97aead..32501b4 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -101,6 +101,8 @@ public:
101 const std::vector<std::string>& getLoginURIs() const; 101 const std::vector<std::string>& getLoginURIs() const;
102 const std::string& getHelperURI() const; 102 const std::string& getHelperURI() const;
103 void resetURIs() const; 103 void resetURIs() const;
104 void setLoginPage(const std::string& login_page);
105 const std::string& getLoginPage();
104 106
105 void forceDisconnect(const LLString& msg); // Force disconnection, with a message to the user. 107 void forceDisconnect(const LLString& msg); // Force disconnection, with a message to the user.
106 void badNetworkHandler(); // Cause a crash state due to bad network packet. 108 void badNetworkHandler(); // Cause a crash state due to bad network packet.
@@ -111,6 +113,8 @@ public:
111 void loadNameCache(); 113 void loadNameCache();
112 void saveNameCache(); 114 void saveNameCache();
113 115
116 bool isInProductionGrid();
117
114 // LLAppViewer testing helpers. 118 // LLAppViewer testing helpers.
115 // *NOTE: These will potentially crash the viewer. Only for debugging. 119 // *NOTE: These will potentially crash the viewer. Only for debugging.
116 virtual void forceErrorLLError(); 120 virtual void forceErrorLLError();
@@ -169,7 +173,7 @@ private:
169 // Thread objects. 173 // Thread objects.
170 static LLTextureCache* sTextureCache; 174 static LLTextureCache* sTextureCache;
171 static LLWorkerThread* sImageDecodeThread; 175 static LLWorkerThread* sImageDecodeThread;
172 static LLTextureFetch* sTextureFetch; 176 static LLTextureFetch* sTextureFetch;
173 177
174 S32 mNumSessions; 178 S32 mNumSessions;
175 179
@@ -196,7 +200,6 @@ extern BOOL gHandleKeysAsync; // gSavedSettings used by llviewerdisplay.cpp & ll
196extern BOOL gProbeHardware; 200extern BOOL gProbeHardware;
197extern LLString gDisabledMessage; // llstartup 201extern LLString gDisabledMessage; // llstartup
198extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup 202extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup
199extern BOOL gInProductionGrid;
200extern LLSD gDebugInfo; 203extern LLSD gDebugInfo;
201 204
202extern BOOL gAllowIdleAFK; 205extern BOOL gAllowIdleAFK;