Merge with http://bitbucket.org/lindenlab/viewer-development (r15992)

2 files changed, 69 insertions, 69 deletions

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 49eead5079..1756f9db90 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -12,16 +12,16 @@
  focus_root="true"
  top="28"
  width="1310">
-  <string
+	<string
      name="DragIndicationImageName"
      value="Accordion_ArrowOpened_Off" />
-  <string
+	<string
      name="SpeakBtnToolTip"
      value="Turns microphone on/off" />
-  <string
+	<string
      name="VoiceControlBtnToolTip"
      value="Shows/hides voice control panel" />
-  <layout_stack
+	<layout_stack
      border_size="0"
      clip="false"
      follows="all"
@@ -33,12 +33,12 @@
      orientation="horizontal"
      top="0"
      width="1310">
-    <layout_panel
+		<layout_panel
          auto_resize="false"
          user_resize="false"
          min_width="2"
          width="2" />
-    <layout_panel
+		<layout_panel
          auto_resize="false"
          layout="topleft"
          max_width="320"
@@ -48,7 +48,7 @@
 		 name="chat_bar_layout_panel"
          user_resize="true"
          width="308" >
-      <panel
+			<panel
 		   name="chat_bar"
 			  filename="panel_nearby_chat_bar.xml"
 			  left="0"
@@ -156,15 +156,15 @@
              tool_tip="Make your avatar do things"
              top="5"
              width="82">
-        <combo_button
+				<combo_button
                  pad_right="10"
                  can_drag="false"
                  use_ellipses="true" />
-        <combo_list
+				<combo_list
                  page_lines="17" />
-      </gesture_combo_list>
-    </layout_panel>
-    <layout_panel
+			</gesture_combo_list>
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="left|right"
          height="28"
@@ -175,7 +175,7 @@
          name="cam_panel"
          user_resize="false"
          width="83">
-      <bottomtray_button
+			<bottomtray_button
               can_drag="false"
              follows="left|right"
              height="23"
@@ -191,12 +191,12 @@
              top="5"
              use_ellipses="true"
              width="80">
-        <init_callback
+				<init_callback
                  function="Button.SetDockableFloaterToggle"
                  parameter="camera" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="left|right"
          height="28"
@@ -205,7 +205,7 @@
          name="splitter_panel"
          user_resize="false"
          width="17">
-      <icon
+			<icon
              follows="left|bottom"
              height="18"
              width="2"
@@ -213,8 +213,8 @@
              image_name="Button_Separator"
              name="separator"
              top="7"/>
-    </layout_panel>
-    <layout_panel
+		</layout_panel>
+		<layout_panel
 		  auto_resize="false"
 		  follows="left|right"
 		  height="28"
@@ -225,7 +225,7 @@
 		  name="avatar_and_destinations_panel"
 		  user_resize="false"
 		  width="103">
-      <bottomtray_button
+			<bottomtray_button
 			 can_drag="false"
 			follows="left|right"
 			height="23"
@@ -241,11 +241,11 @@
 			is_toggle="true"
 			use_ellipses="true"
 			width="100">
-        <bottomtray_button.commit_callback
+				<bottomtray_button.commit_callback
 				  function="Destination.show" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
 		  auto_resize="false"
 		  follows="left|right"
 		  height="28"
@@ -256,7 +256,7 @@
 		  name="avatar_and_destinations_panel"
 		  user_resize="false"
 		  width="103">
-      <bottomtray_button
+			<bottomtray_button
 			 can_drag="false"
 			follows="left|right"
 			height="23"
@@ -272,11 +272,11 @@
 			tool_tip="Change your appearance"
 			use_ellipses="true"
 			width="100">
-        <bottomtray_button.commit_callback
+				<bottomtray_button.commit_callback
 				  function="Avatar.show" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
 		  auto_resize="false"
 		  follows="left|right"
 		  height="28"
@@ -285,7 +285,7 @@
 		  name="splitter_panel"
 		  user_resize="false"
 		  width="17">
-      <icon
+			<icon
              follows="left|bottom"
              height="18"
              width="2"
@@ -293,8 +293,8 @@
              image_name="Button_Separator"
              name="separator"
              top="7"/>
-    </layout_panel>
-    <layout_panel
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -306,7 +306,7 @@
          top_delta="0"
          user_resize="false"
          width="105">
-      <bottomtray_button
+			<bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
 			  height="23"
@@ -322,12 +322,12 @@
 			  is_toggle="true"
 			  use_ellipses="true"
 			  width="100">
-        <bottomtray_button.commit_callback
+				<bottomtray_button.commit_callback
 				  function="ShowSidetrayPanel"
 				 parameter="panel_people" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
 		   auto_resize="false"
 		   follows="right"
 		   height="28"
@@ -339,7 +339,7 @@
 		   top_delta="0"
 		   user_resize="false"
 		   width="105">
-      <bottomtray_button
+			<bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
 			  height="23"
@@ -355,12 +355,12 @@
 			  top="5"
 			  use_ellipses="true"
 			  width="100">
-        <bottomtray_button.commit_callback
+				<bottomtray_button.commit_callback
 				  function="ToggleAgentProfile"
 				  parameter="agent"/>
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
 		   auto_resize="false"
 		   follows="right"
 		   height="28"
@@ -372,7 +372,7 @@
 		   top_delta="0"
 		   user_resize="false"
 		   width="105">
-      <bottomtray_button
+			<bottomtray_button
 			   can_drag="false"
 			  follows="left|right"
 			  height="23"
@@ -388,12 +388,12 @@
 			  top="5"
 			  use_ellipses="true"
 			  width="100">
-        <bottomtray_button.commit_callback
+				<bottomtray_button.commit_callback
 				  function="ToggleHelp"
 				  parameter="f1_help" />
-      </bottomtray_button>
-    </layout_panel>
-    <layout_panel
+			</bottomtray_button>
+		</layout_panel>
+		<layout_panel
 		   follows="left|right"
 		   height="30"
 		   layout="topleft"
@@ -403,9 +403,9 @@
 		   top="0"
 		   user_resize="false"
 		   width="189">
-      <!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
+			<!--*NOTE: min_width of the chiclet_panel (chiclet_list) must be the same
 as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. EXT-991-->
-      <chiclet_panel
+			<chiclet_panel
              chiclet_padding="4"
              follows="left|right"
              height="24"
@@ -416,7 +416,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              name="chiclet_list"
              top="7"
              width="189">
-        <button
+				<button
                  auto_resize="true"
                  follows="right"
                  height="29"
@@ -433,7 +433,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  top="-28"
                  visible="false"
                  width="7" />
-        <button
+				<button
                  auto_resize="true"
                  follows="right"
                  height="29"
@@ -450,13 +450,13 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
                  top="-28"
                  visible="false"
                  width="7" />
-      </chiclet_panel>
-    </layout_panel>
-    <layout_panel auto_resize="false"
+			</chiclet_panel>
+		</layout_panel>
+		<layout_panel auto_resize="false"
                       user_resize="false"
                       width="4"
                       min_width="4"/>
-    <layout_panel
+		<layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -467,7 +467,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
          top="0"
          user_resize="false"
          width="37">
-      <chiclet_im_well
+			<chiclet_im_well
              follows="right"
              height="28"
              layout="topleft"
@@ -476,7 +476,7 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly.
              name="im_well"
              top="0"
              width="35">
-        <!--
+				<!--
 Emulate 4 states of button by background images, see details in EXT-3147. The same should be for notification_well button
 xml attribute           Description
 image_unselected        "Unlit" - there are no new messages
@@ -484,7 +484,7 @@ image_selected          "Unlit" + "Selected" - there are no new messages and the
 image_pressed           "Lit" - there are new messages
 image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well is open
              -->
-        <button
+				<button
                  auto_resize="true"
                  follows="right"
                  halign="center"
@@ -499,13 +499,13 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  name="Unread IM messages"
                  tool_tip="Conversations"
                  width="34">
-          <init_callback
+					<init_callback
                      function="Button.SetDockableFloaterToggle"
                      parameter="im_well_window" />
-        </button>
-      </chiclet_im_well>
-    </layout_panel>
-    <layout_panel
+				</button>
+			</chiclet_im_well>
+		</layout_panel>
+		<layout_panel
          auto_resize="false"
          follows="right"
          height="28"
@@ -516,7 +516,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
          top="0"
          user_resize="false"
          width="37">
-      <chiclet_notification
+			<chiclet_notification
              follows="right"
              height="23"
              layout="topleft"
@@ -525,7 +525,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
              name="notification_well"
              top="5"
              width="35">
-        <button
+				<button
                  auto_resize="true"
                  bottom_pad="3"
                  follows="right"
@@ -541,7 +541,7 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
                  name="Unread"
                  tool_tip="Notifications"
                  width="34">
-          <init_callback
+					<init_callback
                      function="Button.SetDockableFloaterToggle"
                      parameter="notification_well_window" />
 				</button>
@@ -553,5 +553,5 @@ image_pressed_selected  "Lit" + "Selected" - there are new messages and the Well
 		   min_width="4"
 		   name="DUMMY2"
 		   width="8" />
-  </layout_stack>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_people.xml b/indra/newview/skins/minimal/xui/en/panel_people.xml
index 68e12cc444..76baacb091 100644
--- a/indra/newview/skins/minimal/xui/en/panel_people.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_people.xml
@@ -443,7 +443,7 @@ Looking for people to hang out with? Try the Destinations button below.
 		         top="0"
 		         width="40" />			
 			</layout_panel>
-			
+		
 			<layout_panel
 			follows="bottom|left|right"
 			height="23"