diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-26 14:50:13 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-26 14:50:13 -0700 |
| commit | bec806ebd9ae1866a36b89dd0b73d5b3bec49d90 (patch) | |
| tree | c677007f58dfca698dc85c62827605f5ae9ad358 /indra/newview/llfloaterpreference.cpp | |
| parent | 16ba7ae82cb2e9323e7bf527a57079bf4cfeb634 (diff) | |
| parent | 6ad09b875cd58aedcc5ce1c6edeea05adc16a633 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rwxr-xr-x | 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 173b0e538c..4e962e085e 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -772,7 +772,7 @@ void LLFloaterPreference::onBtnOK() llinfos << "Can't close preferences!" << llendl; } - LLPanelLogin::updateLocationCombo( false ); + LLPanelLogin::updateLocationSelectorsVisibility(); } // static @@ -789,7 +789,7 @@ void LLFloaterPreference::onBtnApply( ) apply(); saveSettings(); - LLPanelLogin::updateLocationCombo( false ); + LLPanelLogin::updateLocationSelectorsVisibility(); } // static |