diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-10 15:25:49 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-10 15:25:49 -0700 |
| commit | 2fd59393fc3420c37937731b08b5ee9e5f2f2ab6 (patch) | |
| tree | 9acb15bc211abd9cf8d173890ebe3b0d676dbc7e /indra/newview/llfloaterpreference.cpp | |
| parent | 5a6237741608efb0ff669f422596178f93fbe120 (diff) | |
| parent | 60805b6f202b90b86d90d96eb7d09ae3355343eb (diff) | |
Automated Merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 2ab83eab79..0eeef0039c 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -599,7 +599,7 @@ void LLFloaterPreference::onBtnOK() llinfos << "Can't close preferences!" << llendl; } - LLPanelLogin::refreshLocation( false ); + LLPanelLogin::updateLocationCombo( false ); } // static @@ -616,7 +616,7 @@ void LLFloaterPreference::onBtnApply( ) apply(); saveSettings(); - LLPanelLogin::refreshLocation( false ); + LLPanelLogin::updateLocationCombo( false ); } // static |