MAINT-4800 FIXED Grid labels in combobox could be localized now. Combobox is wider and separator (empty line) was removed.

6 files changed, 50 insertions, 9 deletions

diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 34f3bbf73e..921757ded7 100755
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -237,7 +237,6 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 		}
 	}
 	server_choice_combo->sortByName();
-	server_choice_combo->addSeparator(ADD_TOP);
 	LL_DEBUGS("AppInit")<<"adding current "<<current_grid<<LL_ENDL;
 	server_choice_combo->add(LLGridManager::getInstance()->getGridLabel(), 
 							 current_grid,
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index faa58d423f..6666aecca2 100755
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -119,14 +119,14 @@ void LLGridManager::initialize(const std::string& grid_file)
 	mGridFile = grid_file;
 	// as we don't want an attacker to override our grid list
 	// to point the default grid to an invalid grid
-  	addSystemGrid("Second Life Main Grid (Agni)",
+  	addSystemGrid(LLTrans::getString("AgniGridLabel"),
 				  MAINGRID,
 				  MAIN_GRID_LOGIN_URI,
 				  "https://secondlife.com/helpers/",
 				  DEFAULT_LOGIN_PAGE,
 				  SL_UPDATE_QUERY_URL,
 				  "Agni");
-	addSystemGrid("Second Life Beta Test Grid (Aditi)",
+	addSystemGrid(LLTrans::getString("AditiGridLabel"),
 				  "util.aditi.lindenlab.com",
 				  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
 				  "http://aditi-secondlife.webdev.lindenlab.com/helpers/",
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index a258a874b0..a1e0f981dd 100755
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -119,7 +119,7 @@
     name="At_My_Last_Location_Label"
     left_pad="8"
     bottom_delta="1"
-    width="120">
+    width="110">
     at last location
   </text>
   <combo_box
@@ -157,7 +157,7 @@
     follows="left|top"
     width="170"
     height="26"
-    left_pad="40"
+    left_pad="30"
     text_pad_left="8"
     name="location_edit"
     label="Type a location"
@@ -186,12 +186,12 @@
     height="26"
     max_chars="128"
     label="Select grid"
-    left_pad="40"
+    left_pad="30"
     bottom_delta="0"
     layout="topleft"
     top_pad="2"
     name="server_combo"
-    width="128" />
+    width="148" />
     </layout_panel>
     <layout_panel
       height="172"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f77678e5f8..3a8121cc82 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -96,7 +96,10 @@ Voice Server Version: [VOICE_VERSION]
 	<string name="LoginFailed">Login failed.</string>
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string>
-
+	
+	<string name="AgniGridLabel">Second Life Main Grid (Agni)</string>
+	<string name="AditiGridLabel">Second Life Beta Test Grid (Aditi)</string>
+	
 	<string name="ViewerDownloadURL">http://secondlife.com/download</string>
 	<string name="LoginFailedViewerNotPermitted">
 The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index 2bc0d5a086..4694f657b6 100755
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -39,7 +39,21 @@ namespace
 static const char * const TEST_FILENAME("llslurl_test.xml");
 
 }
-	
+
+//
+// Stub implementation for LLTrans
+//
+class LLTrans
+{
+public:
+	static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args);
+};
+
+std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args)
+{
+	return std::string();
+}
+
 //----------------------------------------------------------------------------
 // Mock objects for the dependencies of the code we're testing
 
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 0eb0ab6500..e68da14fe9 100755
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -38,6 +38,31 @@ namespace
 static const char * const TEST_FILENAME("llviewernetwork_test.xml");
 
 }
+
+//
+// Stub implementation for LLTrans
+//
+class LLTrans
+{
+public:
+	static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args);
+};
+
+std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args)
+{
+	std::string grid_label = std::string();
+	if(xml_desc == "AgniGridLabel")
+	{
+		grid_label = "Second Life Main Grid (Agni)";
+	}
+	else if(xml_desc == "AditiGridLabel")
+	{
+		grid_label = "Second Life Beta Test Grid (Aditi)";
+	}
+
+	return grid_label;
+}
+
 //----------------------------------------------------------------------------
 // Mock objects for the dependencies of the code we're testing