Applied snowglobe-0-v14000-AvatarNameInWindowTitle_v1.patch and set the name in the window title only when running multiple instances

2 files changed, 13 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;
 BOOL gAcceptTOS = FALSE;
 BOOL gAcceptCriticalMessage = FALSE;
 
+std::string gSecondLife;
+std::string gWindowTitle;
+
 eLastExecEvent gLastExecEvent = LAST_EXEC_NORMAL;
 
 LLSD gDebugInfo;
@@ -314,9 +317,6 @@ const char* const VIEWER_WINDOW_CLASSNAME = "Imprudence";
 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 gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4cb7061..82b950e 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -214,6 +214,8 @@ std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
 //
 extern S32 gStartImageWidth;
 extern S32 gStartImageHeight;
+extern std::string gSecondLife;
+extern std::string gWindowTitle;
 
 //
 // local globals
@@ -2144,6 +2146,14 @@ bool idle_startup()
         {
                 LL_DEBUGS("AppInitStartupState") << "STATE_INVENTORY_SEND" << LL_ENDL;
 
+                // Change the window title to include the avatar name if we're using multiple viewers -- MC
+                if (gSavedSettings.getBOOL("AllowMultipleViewers"))
+                {
+                        gWindowTitle = gSecondLife + " - " + firstname + " " + lastname;
+                        LLStringUtil::truncate(gWindowTitle, 255);
+                        gViewerWindow->getWindow()->setWindowTitle(gWindowTitle);
+                }
+
                 // unpack thin inventory
                 LLUserAuth::options_t options;
                 options.clear();