summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-04-17 02:42:27 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-04-17 02:42:27 +0000
commitd85247e63e5ff0b488211b62429a4895b48dee27 (patch)
tree0aa2f02aeef6a8133e0d037e95ad5089b20df9eb /indra/newview/llfloaterpreference.cpp
parentd2597d35cf3aeaf0c47a134dfe9119ef7932b98a (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()