From e4aa2038812c2cf2cfed1b17a437ba620929f84f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 19 Jun 2012 17:20:24 -0700
Subject: PATH-702: Positioning the rebake navmesh button to align with the
 Stand/StopFlying buttons.  Also, parenting the buttons to the toolbar UI
 elements.

---
 indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml | 6 +++---
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index 94ca00945b..35d07eea99 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -9,7 +9,7 @@
     <button
      follows="left|bottom"
      height="19"
-     label="Rebake NavMesh"
+     label="Rebake navmesh"
      layout="topleft"
      left="10"
      name="navmesh_btn"
@@ -20,11 +20,11 @@
   <button
    follows="left|bottom"
    height="19"
-   label="NavMesh Baking..."
+   label="Navmesh baking..."
    layout="topleft"
    left="10"
    name="navmesh_btn_baking"
-   tool_tip="NavMesh is baking"
+   tool_tip="Navmesh is baking."
    top="2"
    visible="false"
    width="113" />
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 107683f1f0..f5c559fe1d 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -93,7 +93,7 @@
                left="0"
                mouse_opaque="false"
                tab_stop="false"
-               name="stand_stop_flying_container"
+               name="state_management_buttons_container"
                visible="false"
                width="200"/>
       </layout_panel>
-- 
cgit v1.2.3