summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-04-17 02:06:30 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-04-17 02:06:30 +0000
commitc57beb8b4bd51add9a92ddc4d704e7bea9c4d940 (patch)
tree8fc0abb0655302822390d227d9ec0ad7d4056563 /indra/newview/llfloaterpreference.cpp
parentfb42741b620cea3d3b6380f1f099c92fcf4f3b04 (diff)
QAR-449 Viewer 1.20 RC 0
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--indra/newview/llfloaterpreference.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 1ad58f2706..e66d545409 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -192,7 +192,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
mMsgPanel->setDefaultBtn(default_btn);
- mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab"));
+ if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
+ {
+ mTabContainer->selectFirstTab();
+ }
}
LLPreferenceCore::~LLPreferenceCore()