summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-04-07 18:39:29 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-04-07 18:39:29 +0300
commitbb2a0adecaee2f7464caff602473d75c6b65bcaa (patch)
tree6da7bc3cf29b8f5f6dd7b08f9beee007b6408f02 /indra/newview/llviewercontrol.cpp
parent7ba7bc6c3733420bd4d73a180627a81640a5b265 (diff)
parentadce2ecdf8f3a0efcd4907699d286012124ac496 (diff)
Merge from default branch
--HG-- branch : product-engine
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;
}