diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-01-18 19:42:28 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-01-18 19:42:28 +0000 |
| commit | 980d8c4599a7ebb62696126f3d5c5709a62f6a9f (patch) | |
| tree | a02ec78321990d7828673d41a1a086e5f0e71de9 /indra/newview/llfloaterpreference.cpp | |
| parent | 3cb5c6864e0e19de30f3bba0f9fafd1ac695bfd1 (diff) | |
svn merge -r 77823:77835 svn+ssh://svn.lindenlab.com/svn/linden/branches/loginxui-for-merge
QAR-222
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index b7b3cef76b..c2780cb8e0 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -442,8 +442,7 @@ void LLFloaterPreference::onClickAbout(void*) // static void LLFloaterPreference::onBtnOK( void* userdata ) { - //refresh splash page if we're displaying it - LLPanelLogin::loadLoginPage(); + LLPanelLogin::refreshLocation( false ); LLFloaterPreference *fp =(LLFloaterPreference *)userdata; // commit any outstanding text entry @@ -489,8 +488,7 @@ void LLFloaterPreference::onBtnApply( void* userdata ) } fp->apply(); - //refresh splash page if we're displaying it - LLPanelLogin::loadLoginPage(); + LLPanelLogin::refreshLocation( false ); } |