Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

1 files changed, 80 insertions, 80 deletions

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 719d3531ed..21c9eb7437 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -63,65 +63,65 @@
            min_width="340"
            name="navigation_layout_panel"
            width="340">
-             <panel
-               background_visible="false"
-               follows="left|top|right"
-               top="3"
-               height="23"
-               layout="topleft"
+	<panel
+	 background_visible="false"
+	 follows="left|top|right"
+	 top="3"
+	 height="23"
+	 layout="topleft"
                left="0"
-               name="navigation_panel"
+	 name="navigation_panel"
                width="340">
-                 <pull_button
-                   follows="left|top"
-                   direction="down"
-                   height="23"
-                   image_overlay="Arrow_Left_Off"
-                   image_bottom_pad="1"
-                   layout="topleft"
-                   left="10"
-                   name="back_btn"
-                   tool_tip="Go back to previous location"
-                   top="2"
-                   width="31" />
-                 <pull_button
-                   follows="left|top"
-                   direction="down"
-                   height="23"
-                   image_overlay="Arrow_Right_Off"
-                   image_bottom_pad="1"
-                   layout="topleft"
-                   left_pad="0"
-                   name="forward_btn"
-                   tool_tip="Go forward one location"
-                   top_delta="0"
-                   width="31" />
-                 <button
-                   follows="left|top"
-                   height="23"
-                   image_bottom_pad="1"
-                   image_overlay="Home_Off"
-                   layout="topleft"
-                   left_pad="7"
-                   name="home_btn"
-                   tool_tip="Teleport to my home location"
-                   top_delta="0"
-                   width="32"/>
-                 <location_input
+	     <pull_button
+	     follows="left|top"
+	     direction="down"
+	     height="23"
+	     image_overlay="Arrow_Left_Off"
+	     image_bottom_pad="1"
+	     layout="topleft"
+	     left="10"
+	     name="back_btn"
+	     tool_tip="Go back to previous location"
+	     top="2"
+	     width="31" />
+	    <pull_button
+	     follows="left|top"
+	     direction="down"
+	     height="23"
+	     image_overlay="Arrow_Right_Off"
+	     image_bottom_pad="1"
+	     layout="topleft"
+	     left_pad="0"
+	     name="forward_btn"
+	     tool_tip="Go forward one location"
+	     top_delta="0"
+	     width="31" />
+	    <button
+	     follows="left|top"
+	     height="23"
+	     image_bottom_pad="1"
+	     image_overlay="Home_Off"
+	     layout="topleft"
+	     left_pad="7"
+	     name="home_btn"
+	     tool_tip="Teleport to my home location"
+	     top_delta="0"
+	     width="32" />
+	    <location_input
                    follows="all"
-                   halign="right"
-                   height="23"
-                   label="Location"
-                   layout="topleft"
-                   left_pad="7"
-                   max_chars="254"
-                   mouse_opaque="false"
-                   name="location_combo"
-                   top_delta="0"
+	     halign="right"
+	     height="23"
+	     label="Location"
+	     layout="topleft"
+	     left_pad="7"
+	     max_chars="254"
+	     mouse_opaque="false"
+	     name="location_combo"
+	     top_delta="0"
                    width="215">
-                 <combo_list
-                   mouse_wheel_opaque="true"/>
-                 </location_input>
+         <combo_list
+         mouse_wheel_opaque="true"/>
+	    </location_input>
              </panel>
          </layout_panel>
          
@@ -146,47 +146,47 @@
          
          <layout_panel
            follows="top|left"
-           layout="topleft"
+	     layout="topleft"
            auto_resize="true"
            user_resize="true"
            min_width="335"
            name="favorites_layout_panel"
            width="335">
-             <favorites_bar
-               follows="left|right|top"
-               font="SansSerifSmall"
+    <favorites_bar
+     follows="left|right|top"
+     font="SansSerifSmall"
                height="20"
-               layout="topleft"
-               left="0"
-               name="favorite"
-               image_drag_indication="Accordion_ArrowOpened_Off"
-               tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+     layout="topleft"
+     left="0"
+     name="favorite"
+     image_drag_indication="Accordion_ArrowOpened_Off"
+     tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
                width="331">
-                 <label
-                   follows="left|top"
-                   height="15"
-                   layout="topleft"
-                   left="10"
-                   name="favorites_bar_label"
-                   text_color="LtGray"
-                   tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
-                   top="12"
-                   width="102">
-                    Favorites Bar
-                 </label>
+        <label
+         follows="left|top"
+         height="15"
+         layout="topleft"
+         left="10"
+         name="favorites_bar_label"
+         text_color="LtGray"
+         tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
+         top="12"
+         width="102">
+          Favorites Bar
+        </label>
                  <!-- More button actually is a text box. -->
                  <more_button
                    follows="left|bottom"
                    font.name="SansSerifSmall"
                    font.style="UNDERLINE"
                    name=">>"
-                   tab_stop="false"
-                   tool_tip="Show more of My Favorites"
-                   top="15"
+                     tab_stop="false"
+                     tool_tip="Show more of My Favorites"
+		     top="15"
                    width="50">
                    More...
                    </more_button>
-             </favorites_bar>
+  </favorites_bar>
          </layout_panel>
      
      </layout_stack>