From b1004f9f53bd757c758d2a9256aebf5cbbe8c3be Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Thu, 25 Jul 2013 06:41:52 -0400 Subject: [PATCH] Patch from internal: Keep gWindowTitle consistent with the window title. --- indra/newview/llappviewer.cpp | 2 +- indra/newview/llstartup.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d1454847d..bbaee5358 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -366,7 +366,7 @@ const char *VFS_DATA_FILE_BASE = "data.db2.x."; const char *VFS_INDEX_FILE_BASE = "index.db2.x."; static std::string gSecondLife; -static std::string gWindowTitle; +std::string gWindowTitle; std::string gLoginPage; std::vector gLoginURIs; diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index f3f55ca45..6c6356cbb 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -257,6 +257,7 @@ LLPointer gStartTexture; // extern S32 gStartImageWidth; extern S32 gStartImageHeight; +extern std::string gWindowTitle; // // local globals @@ -1550,7 +1551,7 @@ bool idle_startup() { name += " " + lastname; } - gViewerWindow->getWindow()->setTitle(LLAppViewer::instance()->getWindowTitle() + "- " + name); + gViewerWindow->getWindow()->setTitle(gWindowTitle += "- " + name); // Pass the user information to the voice chat server interface. LLVoiceClient::getInstance()->userAuthorized(name, gAgentID); // create the default proximal channel