Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from internal: Keep gWindowTitle consistent with the window title.

Browse Source
This commit is contained in:
Lirusaito
2013-07-25 06:41:52 -04:00
parent b17b0615c6
commit b1004f9f53
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llappviewer.cpp
View File

@@ -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<std::string> gLoginURIs;

3
indra/newview/llstartup.cpp
View File

@@ -257,6 +257,7 @@ LLPointer<LLViewerTexture> 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