1 files changed, 5 insertions, 17 deletions

diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp
index ff95f8adce..329d7d26ee 100644
--- a/indra/newview/llsidetray.cpp
+++ b/indra/newview/llsidetray.cpp
@@ -144,12 +144,6 @@ BOOL LLSideTrayTab::postBuild()
 	
 	title_panel->getChild<LLTextBox>(TAB_PANEL_CAPTION_TITLE_BOX)->setValue(mTabTitle);
 
-	static LLUIColor default_background_color = LLUIColorTable::instance().getColor("FloaterDefaultBackgroundColor");
-	static LLUIColor focus_background_color = LLUIColorTable::instance().getColor("FloaterFocusBackgroundColor");
-	
-	setTransparentColor(default_background_color);
-	setBackgroundColor(focus_background_color);
-	
 	return true;
 }
 
@@ -209,11 +203,6 @@ void LLSideTrayTab::reshape		(S32 width, S32 height, BOOL called_from_parent )
 void LLSideTrayTab::draw()
 {
 	LLPanel::draw();
-
-	//border
-	gl_rect_2d(0,0,getRect().getWidth() - 1,getRect().getHeight() - 1,LLColor4::black,false);
-
-
 }
 
 void	LLSideTrayTab::onOpen		(const LLSD& key)
@@ -548,17 +537,15 @@ void LLSideTray::expandSideBar	()
 
 void LLSideTray::highlightFocused()
 {
+	/* uncomment in case something change
 	if(!mActiveTab)
 		return;
-	/* uncomment in case something change
 	BOOL dependent_has_focus = gFocusMgr.childHasKeyboardFocus(this);
 	setBackgroundOpaque( dependent_has_focus ); 
 	mActiveTab->setBackgroundOpaque( dependent_has_focus ); 
 	*/
-	mActiveTab->setBackgroundOpaque( true ); 
-
-	
 }
+
 BOOL	LLSideTray::handleScrollWheel(S32 x, S32 y, S32 mask)
 {
 	BOOL ret = LLPanel::handleScrollWheel(x,y,mask);
@@ -576,6 +563,7 @@ BOOL		LLSideTray::handleMouseDown	(S32 x, S32 y, MASK mask)
 		setFocus(true);	
 	return ret;
 }
+
 void LLSideTray::reshape			(S32 width, S32 height, BOOL called_from_parent)
 {
 	
@@ -686,7 +674,7 @@ void LLSideTray::resetPanelRect	()
 	static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());	
 
 	S32 panel_width = sidetray_params.default_button_width;
-	panel_width += mCollapsed ? sidetray_params.default_button_margin : mMaxBarWidth;
+	panel_width += mCollapsed ? 0 : mMaxBarWidth;
 
 	S32 panel_height = parent_rect.getHeight()-fake_top_offset;
 
@@ -703,7 +691,7 @@ void	LLSideTray::setPanelRect	()
 	const LLRect& parent_rect = gViewerWindow->getRootView()->getRect();
 
 	S32 panel_width = sidetray_params.default_button_width;
-	panel_width += mCollapsed ? sidetray_params.default_button_margin : mMaxBarWidth;
+	panel_width += mCollapsed ? 0 : mMaxBarWidth;
 
 	S32 panel_height = parent_rect.getHeight()-fake_top_offset - nav_rect.getHeight();
 	S32 panel_top = parent_rect.mTop-fake_top_offset - nav_rect.getHeight();