summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-01 21:47:22 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-01 21:47:22 -0700
commitaa0a129b6798f8be554d1d9d41cbd217a0040daf (patch)
treea206cf638fa4a8f48dd869e0ccf12b7b6a428972 /indra/newview/llviewercontrol.cpp
parent98695056c2fbfb91de805d9e2a01cde23668c4d3 (diff)
parent86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (diff)
Automated Merge
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rw-r--r--indra/newview/llviewercontrol.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 23349ab916..4526942d08 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -412,9 +412,9 @@ bool handleHighResSnapshotChanged(const LLSD& newvalue)
bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
{
- if(gVoiceClient)
+ if(LLVoiceClient::getInstance())
{
- gVoiceClient->updateSettings();
+ LLVoiceClient::getInstance()->updateSettings();
}
return true;
}