From 7e554747b722d85142ceae30903d10bac2f62eae Mon Sep 17 00:00:00 2001
From: JessicaLyon <jessica@trinityenterprises.ca>
Date: Mon, 14 Feb 2011 17:22:54 -0500
Subject: [PATCH] Re-added Toy's panel changes.. again.... and taking a break
 before I break anything else

---
 .../default/xui/en/floater_camera_tabs.xml    | 430 ++++++++++++++++++
 .../firestorm/xui/en/floater_group_view.xml   |  19 +
 .../firestorm/xui/en/floater_side_bar_tab.xml |  12 +
 .../firestorm/xui/en/panel_main_inventory.xml | 239 ++++++++++
 .../xui/en/panel_side_tray_tab_caption.xml    |  70 +++
 .../metaharper/xui/en/floater_group_view.xml  |  19 +
 .../metaharper/xui/en/panel_group_general.xml |   1 +
 .../xui/en/panel_group_info_sidetray.xml      |  26 +-
 .../xui/en/panel_main_inventory.xml           |   4 +-
 9 files changed, 805 insertions(+), 15 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_camera_tabs.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/floater_group_view.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/floater_side_bar_tab.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/panel_main_inventory.xml
 create mode 100644 indra/newview/skins/firestorm/xui/en/panel_side_tray_tab_caption.xml
 create mode 100644 indra/newview/skins/metaharper/xui/en/floater_group_view.xml

diff --git a/indra/newview/skins/default/xui/en/floater_camera_tabs.xml b/indra/newview/skins/default/xui/en/floater_camera_tabs.xml
new file mode 100644
index 0000000000..ecb75fda79
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_camera_tabs.xml
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater
+ legacy_header_height="18"
+ header_height="18"
+ can_dock="true"
+ can_minimize="true"
+ can_close="false"
+ can_resize="true"
+ min_width="124"
+ min_height="78"
+ follows="bottom"
+ height="101"
+ layout="topleft"
+ name="camera_floater"
+ help_topic="camera_floater"
+ save_rect="true"
+ save_visibility="true"
+ save_dock_state="true"
+ single_instance="true"
+ width="213">
+    <floater.string
+     name="rotate_tooltip">
+        Rotate Camera Around Focus
+    </floater.string>
+    <floater.string
+     name="zoom_tooltip">
+        Zoom Camera Towards Focus
+    </floater.string>
+    <floater.string
+     name="move_tooltip">
+        Move Camera Up and Down, Left and Right
+    </floater.string>
+    <floater.string
+     name="camera_modes_title">
+        Camera modes
+    </floater.string>
+    <floater.string
+     name="pan_mode_title">
+       Orbit Zoom Pan
+    </floater.string>
+    <floater.string
+     name="presets_mode_title">
+        Preset Views
+    </floater.string>
+    <floater.string
+     name="free_mode_title">
+        View Object
+    </floater.string>
+    <panel
+     border="false"
+     height="101"
+     follows="all"
+     layout="topleft"
+     left="0"
+     top="0"
+     mouse_opaque="false"
+     name="controls"
+     width="213">
+
+    <tab_container
+     name="camera_floater_tab_container"
+     left="0"
+     top="16"
+     width="213"
+     height="86"
+     tab_position="left"
+     tab_width="30"
+     tab_height="20"
+     follows="all">
+
+        <!-- Camera controls panel -->
+        <panel
+         class="camera_zoom_panel"
+         follows="all"
+         height="100"
+         layout="topleft"
+         left="0"
+         mouse_opaque="false"
+         name="zoom"
+         top="0"
+         visible="true"
+         width="180">
+
+            <!-- Camera joystick controls layout starts here -->
+            <layout_stack
+             top="4"
+             enabled="true"
+             height="96"
+             left="0"
+             mouse_opaque="true"
+             name="camera_view_layout_stack"
+             orientation="horizontal"
+             width="180"
+             follows="all">
+
+            <!-- Camera rotate layout panel -->
+            <layout_panel
+             name="camera_rotate_layout_panel"
+             user_resize="false"
+             height="78"
+             width="78">
+
+            <!-- Fake control icon to simulate the joystick widget -->
+            <icon
+             follows="all"
+             height="78"
+             image_name="Cam_Rotate_Out"
+             tool_tip="Orbit camera around focus"
+             layout="topleft"
+             left="0"
+             name="icon_cam_rotate_stick"
+             scale_image="true"
+             sound_flags="3"
+             visible="true"
+             top="0"
+             width="78" />
+
+<!--
+              image_selected="Cam_Rotate_In"
+              image_unselected="Cam_Rotate_Out"
+//-->
+
+            <joystick_rotate
+             follows="all"
+             height="78"
+             image_selected="Blank"
+             image_unselected="Blank"
+             layout="topleft"
+             left="0"
+             mouse_opaque="false"
+             name="cam_rotate_stick"
+             quadrant="left"
+             scale_image="true"
+             sound_flags="3"
+             visible="true"
+             tool_tip="Orbit camera around focus"
+             top="0"
+             width="70" />
+            </layout_panel>
+
+            <!-- Camera zoom layout panel -->
+            <layout_panel
+             name="camera_zoom_layout_panel"
+             can_resize="false"
+             auto_resize="false"
+             user_resize="false"
+             height="78"
+             width="18">
+
+            <button
+             follows="right|top"
+             height="18"
+             image_disabled="AddItem_Disabled"
+             image_selected="AddItem_Press"
+             image_unselected="AddItem_Off"
+             layout="topleft"
+             left="0"
+             name="zoom_plus_btn"
+             tool_tip="Zoom in"
+             width="18"
+             top="0">
+            <commit_callback
+             function="Zoom.plus" />
+            <mouse_held_callback
+             function="Zoom.plus" />
+            </button>
+            <slider_bar
+             height="42"
+             layout="topleft"
+             name="zoom_slider"
+             orientation="vertical"
+             follows="top|right|bottom"
+             tool_tip="Zoom camera toward focus"
+             top_pad="0"
+             min_val="0"
+             max_val="1"
+             width="18">
+            <commit_callback
+             function="Slider.value_changed" />
+            </slider_bar>
+            <button
+             follows="bottom|right"
+             height="18"
+             image_disabled="MinusItem_Disabled"
+             image_selected="MinusItem_Press"
+             image_unselected="MinusItem_Off"
+             layout="topleft"
+             name="zoom_minus_btn"
+             tool_tip="Zoom out"
+             top_pad="0"
+             width="18">
+            <commit_callback
+             function="Zoom.minus" />
+            <mouse_held_callback
+             function="Zoom.minus" />
+            </button>
+            </layout_panel>
+
+            <!-- Camera movement layout panel -->
+            <layout_panel
+             name="panel_track"
+             user_resize="false"
+             height="78"
+             width="78">
+
+            <!-- Fake control icon to simulate the joystick widget -->
+            <icon
+             follows="all"
+             height="78"
+             image_name="Cam_Tracking_Out"
+             layout="topleft"
+             left="0"
+             name="icon_cam_track_stick"
+             tool_tip="Move camera up and down, left and right"
+             scale_image="true"
+             sound_flags="3"
+             visible="true"
+             top="0"
+             width="78" />
+
+<!--
+         image_selected="Cam_Tracking_In"
+         image_unselected="Cam_Tracking_Out"
+//-->
+
+            <joystick_track
+             follows="all"
+             height="78"
+             image_selected="Blank"
+             image_unselected="Blank"
+             layout="topleft"
+             left="0"
+             name="cam_track_stick"
+             quadrant="left"
+             scale_image="true"
+             sound_flags="3"
+             tool_tip="Move camera up and down, left and right"
+             top="0"
+             visible="true"
+             width="78"/>
+
+            </layout_panel>
+            </layout_stack>
+        </panel>
+
+        <!-- Camera presets panel (Front, side, rear) -->
+        <panel
+         follows="top|left"
+         height="86"
+         layout="topleft"
+         left_pad="15"
+         name="camera_views_and_modes_panel"
+         top="16"
+         width="200"
+         visible="true">
+
+        <panel_camera_item
+         name="front_view"
+         tool_tip="Switch to Front View"
+         follows="top"
+         left="5"
+         width="26"
+         height="26">
+        <panel_camera_item.mousedown_callback
+         function="CameraPresets.ChangeView"
+         parameter="front_view" />
+        <panel_camera_item.icon_over
+         width="26" />
+        <panel_camera_item.icon_selected
+         width="26" />
+        <panel_camera_item.picture
+         image_name="Cam_Preset_Front_Off" />
+        <panel_camera_item.selected_picture
+         image_name="Cam_Preset_Front_On" />
+        <panel_camera_item.text
+         text_color="LtYellow"
+         width="1"
+         left="30"
+         name="front_view_text">
+        " "
+<!--            Front //-->
+        </panel_camera_item.text>
+        </panel_camera_item>
+
+        <panel_camera_item
+         name="group_view"
+         tool_tip="Switch to Side View"
+         follows="top"
+         width="26"
+         height="26"
+         left_pad="3">
+        <panel_camera_item.mousedown_callback
+         function="CameraPresets.ChangeView"
+         parameter="group_view" />
+        <panel_camera_item.icon_over
+         width="26" />
+        <panel_camera_item.icon_selected
+         width="26" />
+        <panel_camera_item.picture
+         image_name="Cam_Preset_Side_Off" />
+        <panel_camera_item.selected_picture
+         image_name="Cam_Preset_Side_On" />
+        <panel_camera_item.text
+         text_color="LtYellow"
+         width="1"
+         left="30"
+         name="side_view_text">
+        " "
+<!--            Side   -->
+        </panel_camera_item.text>
+        </panel_camera_item>
+
+        <panel_camera_item
+         name="rear_view"
+         tool_tip="Switch to Rear View"
+         follows="top"
+         width="26"
+         height="26"
+         layout="topleft"
+         left_pad="3">
+        <panel_camera_item.mousedown_callback
+         function="CameraPresets.ChangeView"
+         parameter="rear_view" />
+        <panel_camera_item.icon_over
+         width="26" />
+        <panel_camera_item.icon_selected
+         width="26" />
+        <panel_camera_item.picture
+         image_name="Cam_Preset_Back_Off" />
+        <panel_camera_item.selected_picture
+         image_name="Cam_Preset_Back_On" />
+        <panel_camera_item.text
+         name="rear_view_text"
+         width="1"
+         left="30"
+         text_color="LtYellow">
+        " "
+<!--            Rear    -->
+        </panel_camera_item.text>
+        </panel_camera_item>
+
+        <panel_camera_item
+         name="object_view"
+         tool_tip="Switch to Object View Mode"
+         follows="top"
+         width="26"
+         height="26"
+         layout="topleft"
+         left="5"
+         top_pad="3">
+        <panel_camera_item.mousedown_callback
+         function="CameraPresets.ChangeView"
+         parameter="object_view" />
+        <panel_camera_item.icon_over
+         width="26" />
+        <panel_camera_item.icon_selected
+         width="26" />
+        <panel_camera_item.text
+         width="1"
+         left="30"
+         name="object_view_text">
+        " "
+<!--            Object    -->
+        </panel_camera_item.text>
+        <panel_camera_item.picture
+         image_name="Object_View_Off" />
+        <panel_camera_item.selected_picture
+         image_name="Object_View_On" />
+        </panel_camera_item>
+
+        <panel_camera_item
+         name="mouselook_view"
+         tool_tip="Switch to Mouselook Mode"
+         follows="top"
+         layout="topleft"
+         width="26"
+         left_pad="3">
+        <panel_camera_item.mousedown_callback
+         function="CameraPresets.ChangeView"
+         parameter="mouselook_view" />
+        <panel_camera_item.icon_over
+         width="26" />
+        <panel_camera_item.icon_selected
+         width="26" />
+        <panel_camera_item.text
+         width="1"
+         left="30"
+         name="mouselook_view_text">
+        " "
+<!--            Mouselook    -->
+        </panel_camera_item.text>
+        <panel_camera_item.picture
+         image_name="Mouselook_View_Off" />
+        <panel_camera_item.selected_picture
+         image_name="Mouselook_View_On" />
+        </panel_camera_item>
+      </panel>
+    </tab_container>
+
+    </panel>
+
+    <!-- Fake tab icons -->
+    <icon
+     height="20"
+     follows="top|left"
+     label=""
+     layout="topleft"
+     left="5"
+     image_name="Cam_Avatar_Off"
+     name="presets_btn"
+     tab_stop="false"
+     tool_tip="Camera Views and Modes"
+     top="20"
+     width="25">
+    </icon>
+
+    <icon
+     height="20"
+     follows="top|left"
+     label=""
+     layout="topleft"
+     top_pad="2"
+     image_name="PanOrbit_Off"
+     name="pan_btn"
+     tab_stop="false"
+     tool_tip="Orbit Zoom Pan"
+     width="25">
+    </icon>
+</floater>
diff --git a/indra/newview/skins/firestorm/xui/en/floater_group_view.xml b/indra/newview/skins/firestorm/xui/en/floater_group_view.xml
new file mode 100644
index 0000000000..1ed2c5f540
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/floater_group_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ height="500"
+ layout="topleft"
+ min_height="350"
+ width="470"
+ can_close="true"
+ can_resize="true">
+    <panel
+     background_visible="false"
+     top="5"
+     height="493"
+     right="-10"
+     left="5"
+     class="panel_group_info_sidetray"
+     name="panel_group_info_sidetray"
+     filename="panel_group_info_sidetray.xml"
+    />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/firestorm/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/firestorm/xui/en/floater_side_bar_tab.xml
new file mode 100644
index 0000000000..a6459395bc
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/floater_side_bar_tab.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ can_close="false"
+ can_minimize="false"
+ can_resize="true"
+ min_width="100"
+ min_height="100"
+ save_rect="true"
+ save_visibility="true"
+ header_height="4"
+ >
+</floater>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_main_inventory.xml b/indra/newview/skins/firestorm/xui/en/panel_main_inventory.xml
new file mode 100644
index 0000000000..bb26d42a59
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/panel_main_inventory.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ default_tab_group="1"
+ follows="all"
+ height="423"
+ label="Things"
+ layout="topleft"
+ min_height="350"
+ min_width="240"
+ name="main inventory panel"
+ width="330">
+  <panel.string
+   name="Itemcount">
+  </panel.string>
+  <panel.string
+   name="ItemcountFetching">
+    Fetching [ITEM_COUNT] Items... [FILTER]
+  </panel.string>
+  <panel.string
+   name="ItemcountCompleted">
+    [ITEM_COUNT] Items [FILTER]
+  </panel.string>
+  <panel.string
+   name="ItemcountUnknown">
+
+  </panel.string>
+  <filter_editor
+   text_pad_left="10"
+   follows="left|top|right"
+   height="23"
+   label="Filter Inventory"
+   layout="topleft"
+   left="4"
+   max_length="300"
+   name="inventory search editor"
+   top_pad="4"
+   width="322" />
+  <tab_container
+     bg_alpha_color="DkGray"
+     bg_opaque_color="DkGray"
+     background_visible="true"
+     background_opaque="true"
+     follows="all"
+     halign="center"
+     height="360"
+     layout="topleft"
+     left="4"
+     name="inventory filter tabs"
+     tab_group="1"
+     tab_position="top"
+     top_pad="4"
+     width="322">
+    <inventory_panel
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
+     border="false"
+     bevel_style="none"
+     follows="all"
+     height="338"
+     label="INVENTORY"
+     help_topic="my_inventory_tab"
+     layout="topleft"
+     left="0"
+     name="All Items"
+     sort_order_setting="InventorySortOrder"
+	 show_item_link_overlays="true"
+     top="16"
+     width="288" />
+    <recent_inventory_panel
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
+     border="false"
+     bevel_style="none"
+     follows="all"
+     height="338"
+     label="RECENT"
+     help_topic="recent_inventory_tab"
+     layout="topleft"
+     left_delta="0"
+     name="Recent Items"
+	 show_item_link_overlays="true"
+     width="290" />
+    <worn_inventory_panel
+     bg_opaque_color="DkGray2"
+     bg_alpha_color="DkGray2"
+     background_visible="true"
+     background_opaque="true"
+     border="false"
+     bevel_style="none"
+     follows="all"
+     height="338"
+     label="WORN"
+     help_topic="worn_inventory_tab"
+     layout="topleft"
+     left_delta="0"
+     name="Worn Items"
+	 show_item_link_overlays="true"
+     width="290" />
+  </tab_container>
+  <panel
+   follows="left|right|bottom"
+   auto_resize="true"
+   height="25"
+   layout="topleft"
+   top_pad="-3"
+   left="4"
+   name="bottom_panel"
+   width="322">
+      <panel
+       auto_resize="false"
+       follows="top|left"
+       height="25"
+       left="0"
+       layout="topleft"
+       name="options_gear_btn_panel"
+       width="32">
+          <menu_button
+           follows="top|left"
+           tool_tip="Show additional options"
+           height="25"
+           image_hover_unselected="Toolbar_Left_Over"
+           image_overlay="OptionsMenu_Off"
+           image_selected="Toolbar_Left_Selected"
+           image_unselected="Toolbar_Left_Off"
+           layout="topleft"
+           left="0"
+           name="options_gear_btn"
+           top="0"
+           width="31" />
+      </panel>
+      <panel
+       follows="top|left"
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       left_pad="0"
+       name="add_btn_panel"
+       width="32">
+          <button
+           follows="top|left"
+           height="25"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="AddItem_Off"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           name="add_btn"
+           tool_tip="Add new item"
+           top="0"
+           width="31" />
+      </panel>
+      <panel
+       follows="top|left"
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       left_pad="0"
+       name="new_inventory_panel"
+       width="32">
+          <button
+           follows="top|left"
+           height="25"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="inventory_18"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           name="new_inv_btn"
+           tool_tip="Additional Inventory Window"
+           top="0"
+           width="31">
+           <button.init_callback
+                 function="Button.SetDockableFloaterToggle"
+                 parameter="inventory" />
+           </button>
+      </panel>
+      <panel
+       follows="top|left|right"
+       auto_resize="true"
+       height="25"
+       left_pad="0"
+       right="-33"
+       layout="topleft"
+       name="dummy_panel">
+          <text
+           type="string"
+           length="1"
+           height="13"
+           layout="topleft"
+           left="8"
+           name="ItemcountText"
+           font="SansSerifMedium"
+           top_pad="6"
+           follows="bottom|left|right"
+           width="170">
+          Items
+          </text>
+          <icon
+           follows="top|left|right"
+           height="25"
+           image_name="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           top="0"
+           right="-1"
+           name="dummy_icon" />
+      </panel>
+      <panel
+       auto_resize="false"
+       follows="top|right"
+       height="25"
+       left_pad="0"
+       right="-1"
+       layout="topleft"
+       name="trash_btn_panel"
+       width="32">
+          <dnd_button
+           follows="top|right"
+           height="25"
+           image_hover_unselected="Toolbar_Right_Over"
+           image_overlay="TrashItem_Off"
+           image_selected="Toolbar_Right_Selected"
+           image_unselected="Toolbar_Right_Off"
+           left="0"
+           layout="topleft"
+           name="trash_btn"
+           tool_tip="Remove selected item"
+           top="0"
+           width="31"/>
+       </panel>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/firestorm/xui/en/panel_side_tray_tab_caption.xml
new file mode 100644
index 0000000000..6e2d85e3e1
--- /dev/null
+++ b/indra/newview/skins/firestorm/xui/en/panel_side_tray_tab_caption.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ top="0"
+ background_visible="true"
+ follows="left|top|right"
+ height="20"
+ width="333"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="sidetray_tab_panel">
+    <text
+     follows="left|top|right"
+     font="SansSerifLarge"
+     height="1"
+     layout="topleft"
+     left="10"
+     name="sidetray_tab_title"
+     text_color="white"
+     top="0"
+     value="Side Panel"
+     width="255" />
+
+    <button
+     follows="right|top"
+     height="16"
+     image_selected="Sidebar_Icon_Undock_Press"
+     image_unselected="Sidebar_Icon_Undock_Foreground"
+     image_disabled="Sidebar_Icon_Undock_Press"
+     layout="topleft"
+     name="undock"
+     top_pad="0"
+     right="-28"
+     width="16"
+     tool_tip="Undock" />
+
+    <button
+     follows="right|top"
+     height="16"
+     image_selected="Sidebar_Icon_Dock_Press"
+     image_unselected="Sidebar_Icon_Dock_Foreground"
+     image_disabled="Sidebar_Icon_Dock_Press"
+     layout="topleft"
+     name="dock"
+     top_pad="-16"
+     left_pad="-16"
+     width="16"
+     tool_tip="Dock"
+     visible="false" />
+
+    <button
+     follows="right|top"
+     height="16"
+     image_selected="Icon_Close_Press"
+     image_unselected="Icon_Close_Foreground"
+     image_disabled="Icon_Close_Press"
+     layout="topleft"
+     name="minimize"
+     left_pad="1"
+     width="16"
+     tool_tip="Collapse"
+     visible="true" />
+<!--
+  What does this do here? It seems to be left over from somewhere.
+
+        <button.commit_callback
+         function="Button.ShowHelp" />
+    </button>
+//-->
+</panel>
diff --git a/indra/newview/skins/metaharper/xui/en/floater_group_view.xml b/indra/newview/skins/metaharper/xui/en/floater_group_view.xml
new file mode 100644
index 0000000000..1ed2c5f540
--- /dev/null
+++ b/indra/newview/skins/metaharper/xui/en/floater_group_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<floater
+ height="500"
+ layout="topleft"
+ min_height="350"
+ width="470"
+ can_close="true"
+ can_resize="true">
+    <panel
+     background_visible="false"
+     top="5"
+     height="493"
+     right="-10"
+     left="5"
+     class="panel_group_info_sidetray"
+     name="panel_group_info_sidetray"
+     filename="panel_group_info_sidetray.xml"
+    />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/metaharper/xui/en/panel_group_general.xml b/indra/newview/skins/metaharper/xui/en/panel_group_general.xml
index 13dbb56861..33cde12c91 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_group_general.xml
@@ -328,6 +328,7 @@ Hover your mouse over the options for more help.
          layout="topleft">
          Group Setup
         </text>
+
         <check_box
          name="open_enrollement"
          label="Anyone can join"
diff --git a/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
index 427cfad9b7..0322bc3b5e 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_group_info_sidetray.xml
@@ -149,7 +149,7 @@ background_visible="true"
     </tab_container>
    </layout_panel>
   </layout_stack>
-   
+
    		   <layout_stack
 	     	follows="bottom|left|right"
 			height="25"
@@ -166,7 +166,7 @@ background_visible="true"
 				layout="bottomleft"
 				left="0"
 				name="btn_refresh_lp"
-			    user_resize="false" 
+			    user_resize="false"
 			    auto_resize="false"
 				width="24">
 					<button
@@ -179,33 +179,33 @@ background_visible="true"
 				     name="btn_refresh"
 				     width="23" />
 				</layout_panel>
-				
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
 				layout="bottomleft"
 				left_pad="3"
 				name="btn_chat_lp"
-			    user_resize="false" 
+			    user_resize="false"
 			    auto_resize="true"
 				width="91">
 					<button
 				     follows="bottom|left|right"
 				     label="Chat"
 				     name="btn_chat"
-				     left="1"     
+				     left="1"
 				     height="23"
 				     top="0"
-				     width="90" />		
+				     width="90" />
 				</layout_panel>
-				
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
 				layout="bottomleft"
 				left_pad="3"
 				name="call_btn_lp"
-			    user_resize="false" 
+			    user_resize="false"
 			    auto_resize="true"
 				width="91">
 					<button
@@ -217,16 +217,16 @@ background_visible="true"
 			         layout="topleft"
 			         tool_tip="Call this group"
 			         top="0"
-			         width="90" />		
+			         width="90" />
 				</layout_panel>
-				
+
 				<layout_panel
 				follows="bottom|left|right"
 				height="23"
 				layout="bottomleft"
 				left_pad="3"
 				name="btn_apply_lp"
-			    user_resize="false" 
+			    user_resize="false"
 			    auto_resize="true"
 				width="91">
 					<button
@@ -248,8 +248,8 @@ background_visible="true"
      				 name="btn_create"
                		 visible="true"
                  	 tool_tip="Create a new Group"
-                 	 width="90" />	
+                 	 width="90" />
 				</layout_panel>
 		   </layout_stack>
-  
+
 </panel>
diff --git a/indra/newview/skins/metaharper/xui/en/panel_main_inventory.xml b/indra/newview/skins/metaharper/xui/en/panel_main_inventory.xml
index aa6c025e89..bb26d42a59 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_main_inventory.xml
@@ -234,6 +234,6 @@
            tool_tip="Remove selected item"
            top="0"
            width="31"/>
-      </panel>
-  </panel>
+       </panel>
+	</panel>
 </panel>