From d35a27933b1bf156380d00a4f1a138951a3c78c0 Mon Sep 17 00:00:00 2001
From: Liny <liny.odell@phoenixviewer.com>
Date: Mon, 8 Apr 2013 08:37:28 -0700
Subject: [PATCH] Backed out changeset: 4dfa5f564009

---
 indra/llui/lltabcontainer.cpp           |  3 +--
 indra/newview/app_settings/settings.xml | 11 -----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index dc59e7e800..dda2660d60 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1786,7 +1786,6 @@ void LLTabContainer::setTabImage(LLPanel* child, LLIconCtrl* icon)
 void LLTabContainer::reshapeTuple(LLTabTuple* tuple)
 {
 	static LLUICachedControl<S32> tab_padding ("UITabPadding", 0);
-	static LLUICachedControl<S32> tab_vpadding ("UITabVPadding", 0);
 
 	if (!mIsVertical)
 	{
@@ -1838,7 +1837,7 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple)
 		tuple->mPadding = image_overlay_height;
 
 		tuple->mButton->reshape(tuple->mButton->getRect().getWidth(),
-								llclamp(mTabHeight + tab_vpadding + tuple->mPadding, mMinTabHeight, mMaxTabHeight));
+								llclamp(mTabHeight + tab_padding + tuple->mPadding, mMinTabHeight, mMaxTabHeight));
 		// add back in button height to total tab strip height
 		mTotalTabHeight += tuple->mButton->getRect().getHeight();
 		
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dd5fc205f5..fec8c4bf53 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -15085,17 +15085,6 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>15</integer>
     </map>
-    <key>UITabVPadding</key>
-    <map>
-      <key>Comment</key>
-      <string>UI Tab Padding</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>S32</string>
-      <key>Value</key>
-      <integer>3</integer>
-    </map>
     <key>UpdaterServiceSetting</key>
     <map>
       <key>Comment</key>