summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-08 21:39:38 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-03-08 21:39:38 -0800
commit20379fecd9aea4d3450bcda815ad63f0ce9c729f (patch)
tree21ef1bddf49efc133b9ec74e572345125fb62175 /indra/newview/llfloaterpreference.cpp
parent78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (diff)
parent8bd5a3bca38b0ba663d3563029e54da057020424 (diff)
automated merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--indra/newview/llfloaterpreference.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 8bffe9bf57..036322aae6 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -619,7 +619,7 @@ void LLFloaterPreference::onBtnOK()
llinfos << "Can't close preferences!" << llendl;
}
- LLPanelLogin::refreshLocation( false );
+ LLPanelLogin::updateLocationCombo( false );
}
// static
@@ -636,7 +636,7 @@ void LLFloaterPreference::onBtnApply( )
apply();
saveSettings();
- LLPanelLogin::refreshLocation( false );
+ LLPanelLogin::updateLocationCombo( false );
}
// static