Automated merge with ssh://angela@hg.lindenlab.com/james/gooey/

3 files changed, 13 insertions, 3 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a1e190fc5e..f1aa5c27c1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1687,6 +1687,7 @@ even though the user gets a free copy.
                 Taper
             </text>
             <text
+			 visible="false"
              type="string"
              length="1"
              follows="left|top"
@@ -1769,6 +1770,7 @@ even though the user gets a free copy.
              top_delta="0"
              width="68" />
             <text
+			 visible="false"
              type="string"
              length="1"
              follows="left|top"
@@ -1781,6 +1783,7 @@ even though the user gets a free copy.
                 Profile Cut (begin/end)
             </text>
             <text
+			 visible="false"
              type="string"
              length="1"
              follows="left|top"
@@ -1831,6 +1834,7 @@ even though the user gets a free copy.
              top_delta="0"
              width="68" />
             <text
+			 visible="false"
              type="string"
              length="1"
              follows="left|top"
@@ -1843,6 +1847,7 @@ even though the user gets a free copy.
                 Taper
             </text>
             <spinner
+			 visible="false"
              decimal_digits="2"
              follows="left|top"
              height="19"
@@ -1857,6 +1862,7 @@ even though the user gets a free copy.
              top_pad="3"
              width="68" />
             <spinner
+			 visible="false"
              decimal_digits="2"
              follows="left|top"
              height="19"
@@ -1871,6 +1877,7 @@ even though the user gets a free copy.
              top_delta="0"
              width="68" />
             <text
+			 visible="false"
              type="string"
              length="1"
              follows="left|top"
@@ -1883,6 +1890,7 @@ even though the user gets a free copy.
                 Radius
             </text>
             <text
+			 visible="false"
              type="string"
              length="1"
              follows="left|top"
@@ -1894,6 +1902,7 @@ even though the user gets a free copy.
                 Revolutions
             </text>
             <spinner
+			 visible="false"
              follows="left|top"
              height="19"
              increment="0.05"
@@ -1905,6 +1914,7 @@ even though the user gets a free copy.
              top_pad="4"
              width="68" />
             <spinner
+			 visible="false"
              decimal_digits="2"
              follows="left|top"
              height="19"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 957b4d74db..0768706223 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3058,7 +3058,7 @@ Join me in [REGION]
    icon="alertmodal.tga"
    name="TeleportFromLandmark"
    type="alertmodal">
-Are you sure you want to teleport?
+Are you sure you want to teleport to [LOCATION]?
     <usetemplate
      ignoretext="Confirm that I want to teleport to a landmark"
      name="okcancelignore"
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index 9ad99b1f13..c3776e6a18 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -136,8 +136,8 @@
      left="0"
      name="favorite"
      image_drag_indication="Accordion_ArrowOpened_Off"
-   bottom="55"
-   width="590">
+     bottom="55"
+     width="590">
     <chevron_button name=">>"
                      image_unselected="TabIcon_Close_Off"
                      image_selected="TabIcon_Close_Off"