diff options
author | Don Kjer <don@lindenlab.com> | 2012-07-26 22:59:30 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2012-07-26 22:59:30 +0000 |
commit | bd1b664d45a75e57209e06b288849c0536d00151 (patch) | |
tree | 863ba132ec822f7f2a3feaf5a934f298374179cd /indra/newview/llfloaterpreference.cpp | |
parent | cff3469d46d297fbec34bc0d648588e900cd255c (diff) | |
parent | 124f45d20ecf45c43a9f277be89de2e1fec40b8b (diff) |
Merge viewer-development -> viewer-horde-fixes
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 5edd920c70..60556147a9 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -779,7 +779,7 @@ void LLFloaterPreference::onBtnOK() llinfos << "Can't close preferences!" << llendl; } - LLPanelLogin::updateLocationCombo( false ); + LLPanelLogin::updateLocationSelectorsVisibility(); } // static @@ -796,7 +796,7 @@ void LLFloaterPreference::onBtnApply( ) apply(); saveSettings(); - LLPanelLogin::updateLocationCombo( false ); + LLPanelLogin::updateLocationSelectorsVisibility(); } // static |