summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-13 05:50:56 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-13 05:50:56 +0000
commit953aec0613081686f7a56af0e9255f4ce15cf9cc (patch)
treefef267ca3fbef3ec3339c809b1eed188d08bf7da /indra/newview/skins
parent2ac24047df0fd967ef67564e8d7bfe94dcf11554 (diff)
More merge fixes (side panel merge issue)
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_side_tray.xml19
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index d404b45ef8..4f8adf6ecb 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -101,25 +101,6 @@ color="DkGray"
/>
</sidetray_tab>
- <sidetray_tab
- name="sidebar_group_temp"
- tab_title="Group Temp"
- description="Group Information."
- image="TabIcon_Me_Off"
- mouse_opaque="false"
- background_visible="true"
- bg_opaque_color="0.5 0.5 0.5 1.0"
- >
- <panel
- class="panel_group_info"
- name="panel_group_info"
- filename="floater_groupinfo.xml"
- label="Groups"
- border="true"
- />
- </sidetray_tab>
-
-
<sidetray_tab
name="sidebar_appearance"
tab_title="Appearance"