summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-07 10:40:38 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-07 10:40:38 +0100
commitec0be6639058c9fa242f8fd9c0380bef44c02e1d (patch)
tree79730fa38b4f1952571d66bb1bc08e9691711b41 /indra/newview/llviewercontrol.cpp
parenta7085418df1ada6e19b94b6df772ed21e663d119 (diff)
parent0bb3f144c0a6712a269246975635962b3b5f48d0 (diff)
merged backout.
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;
}