automated merge

1 files changed, 0 insertions, 282 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
deleted file mode 100644
index 9727c54c6b..0000000000
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-background_visible="true"
- follows="all"
- height="570"
- label="Group Profile"
- layout="topleft"
- min_height="350"
- left="0"
- top="20"
- name="GroupInfo"
- width="313">
-    <panel.string
-     name="default_needs_apply_text">
-        There are unsaved changes
-    </panel.string>
-    <panel.string
-     name="want_apply_text">
-        Do you want to save these changes?
-    </panel.string>
-    <panel.string
-     name="group_join_btn">
-        Join (L$[AMOUNT])
-    </panel.string>
-    <panel.string
-     name="group_join_free">
-        Free
-    </panel.string>
-    <panel
-      name="group_info_top"
-      follows="top|left"
-      top="0"
-      left="0"
-      height="129"
-      width="313"
-      layout="topleft">
-    <button
-     follows="top|right"
-     height="23"
-     image_overlay="BackArrow_Off"
-     layout="topleft"
-     name="back"
-     left="10"
-     tab_stop="false"
-     top="2"
-     width="23" />
-    <text
-     layout="topleft"
-     name="group_name"
-     value="(Loading...)"
-      font="SansSerifHuge"
-      height="20"
-      left_pad="5"
-     text_color="white"
-      top="3"
-     use_ellipses="true"
-      width="270"
-      follows="top|left"
-      word_wrap="true"
-      mouse_opaque="false"/>
-    <line_editor
-     follows="left|top"
-     font="SansSerif"
-     label="Type your new group name here"
-     layout="topleft"
-     left_delta="10"
-     max_length="35"
-     name="group_name_editor"
-     top_delta="5"
-     width="270"
-     height="20"
-     visible="false" />
-    <texture_picker
-     follows="left|top"
-     height="113"
-     label=""
-     layout="topleft"
-     left="10"
-     name="insignia"
-     no_commit_on_selection="true"
-     tool_tip="Click to choose a picture"
-     top_pad="5"
-     width="100" />
-    <text
-      font="SansSerifSmall"
-      text_color="White_50"
-      width="190"
-      follows="top|left"
-      layout="topleft"
-      mouse_opaque="false"
-     type="string"
-     height="16"
-     length="1"
-     left_pad="10"
-     name="prepend_founded_by"
-     top_delta="0">
-      Founder:
-    </text>
-    <name_box
-     follows="left|top"
-     height="16"
-     initial_value="(retrieving)"
-     layout="topleft"
-     left_delta="0"
-     link="true"
-     name="founder_name"
-     top_pad="2"
-     use_ellipses="true"
-     width="190" />
-    <text
-    font="SansSerifMedium"
-    text_color="EmphasisColor"
-     type="string"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     name="join_cost_text"
-     top_pad="10"
-     visible="true"
-     width="190">
-      Free
-    </text>
-    <button
-     follows="left|top"
-     left_delta="0"
-     top_pad="6"
-     height="23"
-     label="JOIN NOW!"
-     name="btn_join"
-     visible="true"
-     width="120" />
-    </panel>
-   <layout_stack
-     name="layout"
-     orientation="vertical"
-      follows="all"
-     left="0"
-     top_pad="0"
-     height="437"
-     width="313"
-     border_size="0">
-   <layout_panel
-      name="group_accordions"
-      follows="all"
-      layout="topleft"
-      auto_resize="true"
-      >
-   <accordion
-     left="0"
-     top="0"
-           single_expansion="true"
-             follows="all"
-             layout="topleft"
-             name="groups_accordion">
-             <accordion_tab
-            expanded="true"
-            layout="topleft"
-            name="group_general_tab"
-            title="General">
-            <panel
-             border="false"
-             class="panel_group_general"
-             filename="panel_group_general.xml"
-             layout="topleft"
-             left="0"
-             follows="all"
-             help_topic="group_general_tab"
-             name="group_general_tab_panel"
-             top="0" />
-         </accordion_tab>
-         <accordion_tab
-            expanded="false"
-            layout="topleft"
-            name="group_roles_tab"
-            title="Roles">
-            <panel
-            border="false"
-            class="panel_group_roles"
-             filename="panel_group_roles.xml"
-             layout="topleft"
-             left="0"
-             name="group_roles_tab_panel"
-             top="0" />
-         </accordion_tab>
-         <accordion_tab
-                 expanded="false"
-                 layout="topleft"
-                 name="group_notices_tab"
-                 title="Notices">
-        <panel
-        border="false"
-         class="panel_group_notices"
-         filename="panel_group_notices.xml"
-         layout="topleft"
-         left="0"
-         help_topic="group_notices_tab"
-         name="group_notices_tab_panel"
-         top="0" />
-         </accordion_tab>
-        <accordion_tab
-                 expanded="false"
-                 layout="topleft"
-                 name="group_land_tab"
-                 title="Land/Assets">
-        <panel
-        border="false"
-         class="panel_group_land_money"
-         filename="panel_group_land_money.xml"
-         layout="topleft"
-         left="0"
-         name="group_land_tab_panel"
-         top="0" />
-         </accordion_tab>
-         </accordion>
-   </layout_panel>
-   <layout_panel
-         height="25"
-         layout="topleft"
-         auto_resize="false"
-         left="0"
-   name="button_row"
-   follows="bottom|left"
-   width="313">
-   <button
-    follows="bottom|left"
-     height="23"
-     image_overlay="Refresh_Off"
-     layout="topleft"
-     left="5"
-     top="0"
-     name="btn_refresh"
-     width="23" />
-    <button
-    follows="bottom|left"
-                 height="18"
-                 image_selected="AddItem_Press"
-                 image_unselected="AddItem_Off"
-                 image_disabled="AddItem_Disabled"
-                 layout="topleft"
-                 left_pad="2"
-                 top_delta="3"
-     name="btn_create"
-               visible="true"
-                 tool_tip="Create a new Group"
-                 width="18" />
-   <!-- <button
-     left_pad="10"
-     height="20"
-     label="Cancel"
-     label_selected="Cancel"
-     name="btn_cancel"
-     visible="false"
-     width="65" />-->
-     <button
-      follows="bottom|left"
-     label="Chat"
-     name="btn_chat"
-     left_pad="2"     
-     height="23"
-     top_delta="-3"
-     width="60" />
-     <button
-         follows="bottom|left"
-         left_pad="2"
-         height="23"
-     name="btn_call"
-     label="Group Call"
-         layout="topleft"
-         tool_tip="Call this group"
-         width="95" />
-     <button
-     follows="bottom|left"
-     height="23"
-     label="Save"
-     label_selected="Save"
-     name="btn_apply"
-     left_pad="2"
-     width="85" />
-     </layout_panel>
-  </layout_stack>
-</panel>