summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-04-07 10:27:10 -0700
committerEli Linden <eli@lindenlab.com>2010-04-07 10:27:10 -0700
commitde62c3378171a69ff9a39f2f626f1b1d33d0763f (patch)
tree053883ba8ae6d02460736ed8a786f1913761b00d /indra/newview/llviewercontrol.cpp
parent25df7aca29074b6ae7f108c91673be117522bfc9 (diff)
parent3ecec85feb4e9878b32f5737ab8e35747360f138 (diff)
Merge
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rw-r--r--indra/newview/llviewercontrol.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index ef6379948a..6f037177fa 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -413,6 +413,7 @@ bool handleHighResSnapshotChanged(const LLSD& newvalue)
bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
{
+ if(LLVoiceClient::getInstance())
LLVoiceClient::getInstance()->updateSettings();
return true;
}
@@ -443,7 +444,7 @@ bool handleVelocityInterpolate(const LLSD& newvalue)
bool handleForceShowGrid(const LLSD& newvalue)
{
- LLPanelLogin::updateServer( );
+ LLPanelLogin::refreshLocation( false );
return true;
}