diff options
author | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:50 -0500 |
commit | 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch) | |
tree | bcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/viewer.h | |
parent | Second Life viewer sources 1.13.3.2 (diff) | |
download | meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2 meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz |
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/viewer.h')
-rw-r--r-- | linden/indra/newview/viewer.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/linden/indra/newview/viewer.h b/linden/indra/newview/viewer.h index 34ca249..125b0ec 100644 --- a/linden/indra/newview/viewer.h +++ b/linden/indra/newview/viewer.h | |||
@@ -61,6 +61,9 @@ class LLViewerRegion; | |||
61 | class LLVFS; | 61 | class LLVFS; |
62 | class LLGlobalEconomy; | 62 | class LLGlobalEconomy; |
63 | class LLPieMenu; | 63 | class LLPieMenu; |
64 | class LLWorkerThread; | ||
65 | class LLTextureFetch; | ||
66 | class LLTextureCache; | ||
64 | 67 | ||
65 | // | 68 | // |
66 | // Global Variables | 69 | // Global Variables |
@@ -72,7 +75,6 @@ extern S32 gNumSessions; | |||
72 | extern BOOL gNoRender; | 75 | extern BOOL gNoRender; |
73 | extern LLMemoryInfo gSysMemory; | 76 | extern LLMemoryInfo gSysMemory; |
74 | extern BOOL gLogMessages; | 77 | extern BOOL gLogMessages; |
75 | extern BOOL gLogUTC; | ||
76 | extern BOOL gUseAudio; | 78 | extern BOOL gUseAudio; |
77 | extern BOOL gConnectToSomething; | 79 | extern BOOL gConnectToSomething; |
78 | extern BOOL gGodConnect; | 80 | extern BOOL gGodConnect; |
@@ -106,6 +108,7 @@ extern BOOL gQuitRequested; // User wants to quit, may have modified documen | |||
106 | extern BOOL gLogoutRequestSent; // Disconnect message sent to simulator, no longer safe to send messages to the sim. | 108 | extern BOOL gLogoutRequestSent; // Disconnect message sent to simulator, no longer safe to send messages to the sim. |
107 | extern BOOL gInitializationComplete; // OK to call display() and idle() | 109 | extern BOOL gInitializationComplete; // OK to call display() and idle() |
108 | extern BOOL gUseWireframe; | 110 | extern BOOL gUseWireframe; |
111 | extern BOOL gPurgeCache; // Cache was purged on startup | ||
109 | extern U32 gSecondsPerDay; | 112 | extern U32 gSecondsPerDay; |
110 | extern U32 gSecondsPerYear; | 113 | extern U32 gSecondsPerYear; |
111 | // Is the Pacific time zone (aka server time zone) | 114 | // Is the Pacific time zone (aka server time zone) |
@@ -143,6 +146,10 @@ extern LLVFS *gStaticVFS; | |||
143 | 146 | ||
144 | extern LLUUID gViewerDigest; // MD5 digest of the viewer's executable file. | 147 | extern LLUUID gViewerDigest; // MD5 digest of the viewer's executable file. |
145 | 148 | ||
149 | extern LLWorkerThread* gImageDecodeThread; | ||
150 | extern LLTextureFetch* gTextureFetch; | ||
151 | extern LLTextureCache* gTextureCache; | ||
152 | |||
146 | class LLURLSimString | 153 | class LLURLSimString |
147 | { | 154 | { |
148 | public: | 155 | public: |
@@ -158,7 +165,7 @@ private: | |||
158 | static S32 parseGridIdx(const LLString& in_string, S32 idx0, S32* res, S32 max); | 165 | static S32 parseGridIdx(const LLString& in_string, S32 idx0, S32* res, S32 max); |
159 | struct llurl_data | 166 | struct llurl_data |
160 | { | 167 | { |
161 | char mSimName[DB_SIM_NAME_BUF_SIZE]; | 168 | char mSimName[DB_SIM_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ |
162 | S32 mSimX; | 169 | S32 mSimX; |
163 | S32 mSimY; | 170 | S32 mSimY; |
164 | S32 mSimZ; | 171 | S32 mSimZ; |