2 files changed, 11 insertions, 1 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b12c253..e438f0c 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2173,7 +2173,14 @@ bool idle_startup()
                 // 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::format_map_t args;
+                        args["[FIRST_NAME]"] = firstname;
+                        args["[LAST_NAME]"] = lastname;
+                        args["[GRID_NAME]"] = (gHippoGridManager->getConnectedGrid()->getGridName().empty()) ? 
+                                gHippoGridManager->getConnectedGrid()->getGridNick() :
+                                gHippoGridManager->getConnectedGrid()->getGridName();
+                        std::string title_text = LLTrans::getString("TitleBarMultiple", args);
+                        gWindowTitle = gSecondLife + " - " + title_text;
                         LLStringUtil::truncate(gWindowTitle, 255);
                         gViewerWindow->getWindow()->setWindowTitle(gWindowTitle);
                 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index 5bd0924..a17d0de 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -17,6 +17,9 @@
   <string name="StatBarMonthsOfYear">
     January:February:March:April:May:June:July:August:September:October:November:December
   </string>
+  <string name="TitleBarMultiple">
+    [FIRST_NAME] [LAST_NAME] on [GRID_NAME]
+  </string>
 
   <!-- Login -->
   <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>