diff options
author | McCabe Maxsted | 2010-06-06 06:14:18 -0700 |
---|---|---|
committer | Jacek Antonelli | 2010-06-19 02:43:32 -0500 |
commit | 35af28cec1c16e66da3abff4d75a8a68dc381a72 (patch) | |
tree | e183627295f62f1d6564211f3f98db8984089067 /linden/indra/newview/llappviewer.cpp | |
parent | Removed 'Received animation state for unknown avatar' log spam (diff) | |
download | meta-impy-35af28cec1c16e66da3abff4d75a8a68dc381a72.zip meta-impy-35af28cec1c16e66da3abff4d75a8a68dc381a72.tar.gz meta-impy-35af28cec1c16e66da3abff4d75a8a68dc381a72.tar.bz2 meta-impy-35af28cec1c16e66da3abff4d75a8a68dc381a72.tar.xz |
Applied snowglobe-0-v14000-AvatarNameInWindowTitle_v1.patch and set the name in the window title only when running multiple instances
Diffstat (limited to 'linden/indra/newview/llappviewer.cpp')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index b8d0d14..35e7a46 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -235,6 +235,9 @@ BOOL gUseQuickTime = TRUE; | |||
235 | BOOL gAcceptTOS = FALSE; | 235 | BOOL gAcceptTOS = FALSE; |
236 | BOOL gAcceptCriticalMessage = FALSE; | 236 | BOOL gAcceptCriticalMessage = FALSE; |
237 | 237 | ||
238 | std::string gSecondLife; | ||
239 | std::string gWindowTitle; | ||
240 | |||
238 | eLastExecEvent gLastExecEvent = LAST_EXEC_NORMAL; | 241 | eLastExecEvent gLastExecEvent = LAST_EXEC_NORMAL; |
239 | 242 | ||
240 | LLSD gDebugInfo; | 243 | LLSD gDebugInfo; |
@@ -314,9 +317,6 @@ const char* const VIEWER_WINDOW_CLASSNAME = "Imprudence"; | |||
314 | const char *VFS_DATA_FILE_BASE = "data.db2.x."; | 317 | const char *VFS_DATA_FILE_BASE = "data.db2.x."; |
315 | const char *VFS_INDEX_FILE_BASE = "index.db2.x."; | 318 | const char *VFS_INDEX_FILE_BASE = "index.db2.x."; |
316 | 319 | ||
317 | static std::string gSecondLife; | ||
318 | static std::string gWindowTitle; | ||
319 | |||
320 | std::string gLoginPage; | 320 | std::string gLoginPage; |
321 | std::vector<std::string> gLoginURIs; | 321 | std::vector<std::string> gLoginURIs; |
322 | static std::string gHelperURI; | 322 | static std::string gHelperURI; |