EXT-6844 FIXED Eliminated truncation in Floater World Map

- Switched the order of the two lines such that the longer string (yellow) is below the shorter string (purple)
- Fixed button length in PT locale

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/506/

--HG--
branch : product-engine

2 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index ad40cafe61..ece406f9b1 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -178,16 +178,16 @@
      width="90">
         Land Sale
     </text>
-    <icon
-     color="1 1 0.25 1"
+        <icon
+     color="0.5 0.25 1 1"
      follows="top|right"
      height="16"
      image_name="legend.tga"
      layout="topleft"
      mouse_opaque="true"
      name="square2"
-     left="41"
-     top_pad="-2"
+     left="20"
+     top_pad="2"
      width="16" />
     <text
      type="string"
@@ -196,21 +196,21 @@
      height="16"
      layout="topleft"
      left_pad="0"
-     name="by_owner_label"
+     name="auction_label"
      top_delta="3"
-     width="100">
-       by owner
+     width="170">
+        land auction
     </text>
-        <icon
-     color="0.5 0.25 1 1"
+    <icon
+     color="1 1 0.25 1"
      follows="top|right"
      height="16"
      image_name="legend.tga"
      layout="topleft"
      mouse_opaque="true"
      name="square2"
-     left="41"
-     top_pad="-3"
+     left="20"
+     top_pad="-5"
      width="16" />
     <text
      type="string"
@@ -219,10 +219,10 @@
      height="16"
      layout="topleft"
      left_pad="0"
-     name="auction_label"
+     name="by_owner_label"
      top_delta="3"
-     width="170">
-        land auction
+     width="100">
+       by owner
     </text>
 
     <button
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 65e48b4bfd..878d0b1973 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -6,7 +6,7 @@
 		</text>
 	</panel>
 	<panel name="layout_panel_2">
-		<button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" width="135"/>
+		<button font="SansSerifSmall" label="Mostra minha localização" label_selected="Mostra minha localização" left_delta="91" name="Show My Location" tool_tip="Centrar o mapa na localização do meu avatar" />
 		<text name="me_label">
 			Eu
 		</text>