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

2 files changed, 8 insertions, 5 deletions

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: