summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--indra/newview/llfloaterpreference.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 060952667b..cac2d0a0b6 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -127,7 +127,7 @@ S32 pref_min_height()
}
-LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton * default_btn) :
+LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * default_btn) :
mTabContainer(tab_container),
mGeneralPanel(NULL),
mInputPanel(NULL),
@@ -314,7 +314,7 @@ void LLPreferenceCore::cancel()
// static
void LLPreferenceCore::onTabChanged(void* user_data, bool from_click)
{
- LLTabContainerCommon* self = (LLTabContainerCommon*)user_data;
+ LLTabContainer* self = (LLTabContainer*)user_data;
gSavedSettings.setS32("LastPrefTab", self->getCurrentPanelIndex());
}
@@ -363,7 +363,7 @@ BOOL LLFloaterPreference::postBuild()
mPreferenceCore = new LLPreferenceCore(
LLUICtrlFactory::getTabContainerByName(this, "pref core"),
- static_cast<LLButton *>(getChildByName("OK"))
+ getChild<LLButton>("OK")
);
sInstance = this;