Second Life viewer sources 1.19.0.0

1 files changed, 7 insertions, 7 deletions

diff --git a/linden/indra/llui/lltabcontainervertical.cpp b/linden/indra/llui/lltabcontainervertical.cpp
index 5a04417..334cb43 100644
--- a/linden/indra/llui/lltabcontainervertical.cpp
+++ b/linden/indra/llui/lltabcontainervertical.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -185,14 +185,14 @@ void LLTabContainerVertical::addTabPanel(LLPanel* child, const LLString& label,
         {
                 LLButton *btn = new LLButton("vert tab button",
                         btn_rect,
-                        "tab_left.tga",
-                        "tab_left_selected.tga", 
+                        "",
+                        "", 
                         "", 
                         &LLTabContainerVertical::onTabBtn, NULL,
                         font,
                         trimmed_label, trimmed_label);
                 btn->setSaveToXML(false);
-                btn->setFixedBorder(16, 16);
+                btn->setImages("tab_left.tga", "tab_left_selected.tga");
                 btn->setScaleImage(TRUE);
                 btn->setHAlign(LLFontGL::LEFT);
                 btn->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
@@ -306,7 +306,7 @@ BOOL LLTabContainerVertical::selectTab(S32 which)
 
         //if( gFocusMgr.childHasKeyboardFocus( this ) )
         //{
-        //      gFocusMgr.setKeyboardFocus( NULL, NULL );
+        //      gFocusMgr.setKeyboardFocus( NULL );
         //}
 
         LLTabTuple* selected_tuple = mTabList[which];
@@ -476,7 +476,7 @@ BOOL LLTabContainerVertical::handleMouseDown( S32 x, S32 y, MASK mask )
                 {
                         LLButton* tab_button = mTabList[getCurrentPanelIndex()]->mButton;
                         gFocusMgr.setMouseCapture(this);
-                        gFocusMgr.setKeyboardFocus(tab_button, NULL);
+                        gFocusMgr.setKeyboardFocus(tab_button);
                 }
         }
         return handled;