From 6e72afbcfa13dcbca69d0f5260017ccab4a6bc66 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Fri, 13 Jan 2012 22:36:00 +0100
Subject: [PATCH] Oops ... backed out unfinished testing code.

---
 indra/llui/lltabcontainer.cpp                      | 12 ------------
 indra/llui/lltabcontainer.h                        |  9 ---------
 indra/newview/skins/default/xui/en/panel_picks.xml |  2 --
 3 files changed, 23 deletions(-)

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index d9f5a849ef..c846493a3c 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -219,8 +219,6 @@ LLTabContainer::Params::Params()
 	first_tab("first_tab"),
 	middle_tab("middle_tab"),
 	last_tab("last_tab"),
-	panel_border("panel_border",false),
-	panel_bevel_style("panel_bevel_style",LLViewBorder::BEVEL_OUT),
 	use_custom_icon_ctrl("use_custom_icon_ctrl", false),
 	tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0),
 	use_ellipses("use_ellipses"),
@@ -242,8 +240,6 @@ LLTabContainer::LLTabContainer(const LLTabContainer::Params& p)
 	mMaxScrollPos(0),
 	mTitleBox(NULL),
 	mTopBorderHeight(LLPANEL_BORDER_WIDTH),
-	mPanelBorder(p.panel_border),
-	mPanelBevelStyle(p.panel_bevel_style),
 	mLockedTabCount(0),
 	mMinTabWidth(0),
 	mMaxTabWidth(p.tab_max_width),
@@ -305,14 +301,6 @@ LLTabContainer::LLTabContainer(const LLTabContainer::Params& p)
 	}
 
 	initButtons( );
-
-	if(mPanelBorder)
-	{
-		llwarns << "adding border " << mPanelBevelStyle << llendl;
-		LLViewBorder::Params p;
-		p.bevel_style(mPanelBevelStyle);
-		addChild( LLUICtrlFactory::create<LLViewBorder>(p) );
-	}
 }
 
 LLTabContainer::~LLTabContainer()
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
index f015eff980..cb79a7075b 100644
--- a/indra/llui/lltabcontainer.h
+++ b/indra/llui/lltabcontainer.h
@@ -120,12 +120,6 @@ public:
 		 */
 		Optional<S32>						tab_icon_ctrl_pad;
 
-		/**
-		 * Defines if all panels should get a panel added automatically
-		 */
-		Optional<bool>						panel_border;
-		Optional<LLViewBorder::EBevel>		panel_bevel_style;
-
 		Params();
 	};
 
@@ -324,9 +318,6 @@ private:
 	bool							mCustomIconCtrlUsed;
 	S32								mTabIconCtrlPad;
 	bool							mUseTabEllipses;
-
-	bool							mPanelBorder;
-	LLViewBorder::EBevel			mPanelBevelStyle;
 };
 
 #endif  // LL_TABCONTAINER_H
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index a24be802d4..b1e3e021f5 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -25,8 +25,6 @@ background_opaque="false"
   left="0"
   name="accordion"
   top="4"
- panel_border="true"
- panel_bevel_style="out"
   width="313">
     <panel
      layout="topleft"