summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-08-09 12:06:09 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-08-09 12:06:09 -0700
commit9488baada3c0aec7cfa4256708fdda82861cd502 (patch)
tree1f71293b54161733269a6f340574ec4960623d0f /indra/newview/llfloaterpreference.cpp
parentde08d74dc6da594c20aed3673114cbc0ef6d3305 (diff)
parent1869a399beb2cb3fa52d21f9c288f4c3b6ab4deb (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rwxr-xr-xindra/newview/llfloaterpreference.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 3df68a6ea1..797aba2b98 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -768,7 +768,7 @@ void LLFloaterPreference::onBtnOK()
llinfos << "Can't close preferences!" << llendl;
}
- LLPanelLogin::updateLocationCombo( false );
+ LLPanelLogin::updateLocationSelectorsVisibility();
}
// static
@@ -785,7 +785,7 @@ void LLFloaterPreference::onBtnApply( )
apply();
saveSettings();
- LLPanelLogin::updateLocationCombo( false );
+ LLPanelLogin::updateLocationSelectorsVisibility();
}
// static