diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 16:09:14 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 16:09:14 -0700 |
| commit | a11ec0c89f618cb9d039274e850356694a28dbb1 (patch) | |
| tree | 42f4e2637220af26a68dcf8acaa8dbf042082dbc /indra/newview/llfloaterpreference.cpp | |
| parent | 8daf25b65c30f58889ed5923d43bf785cb758026 (diff) | |
| parent | 7d8b37f72488ce30503d97d88e804160b11c6eff (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 e2c5ad6d02..49d5670c57 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 |