From 953aec0613081686f7a56af0e9255f4ce15cf9cc Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Thu, 13 Aug 2009 05:50:56 +0000
Subject: More merge fixes (side panel merge issue)

---
 indra/newview/llsidetray.cpp                          |  3 +++
 .../newview/skins/default/xui/en/panel_side_tray.xml  | 19 -------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index 438b1b558f..0558cc3488 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -152,6 +152,9 @@ static const S32 splitter_margin = 1;
 //virtual 
 void	LLSideTrayTab::arrange(S32 width, S32 height )
 {
+	if(!mMainPanel)
+		return;
+	
 	S32 offset = 0;
 
 	LLView* title_panel = getChildView(TAB_PANEL_CAPTION_NAME, true, false);
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"
-- 
cgit v1.2.3