summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-07 11:08:04 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-07 11:08:04 -0700
commit658ccc3e85487f9f24ff3b5926e60d6cce7f42e0 (patch)
treefe3f862878af5793aeec797d63c1d7c114d3c68d /indra/newview/llviewercontrol.cpp
parent0bb3f144c0a6712a269246975635962b3b5f48d0 (diff)
Re-insert backed out SLE checkin so we can fix it
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rw-r--r--indra/newview/llviewercontrol.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index b2b7e653e4..8627f08891 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -413,9 +413,9 @@ bool handleHighResSnapshotChanged(const LLSD& newvalue)
bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
{
- if(gVoiceClient)
+ if(LLVoiceClient::getInstance())
{
- gVoiceClient->updateSettings();
+ LLVoiceClient::getInstance()->updateSettings();
}
return true;
}
@@ -446,7 +446,7 @@ bool handleVelocityInterpolate(const LLSD& newvalue)
bool handleForceShowGrid(const LLSD& newvalue)
{
- LLPanelLogin::refreshLocation( false );
+ LLPanelLogin::updateServer( );
return true;
}