summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-08 21:39:38 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-03-08 21:39:38 -0800
commit20379fecd9aea4d3450bcda815ad63f0ce9c729f (patch)
tree21ef1bddf49efc133b9ec74e572345125fb62175 /indra/newview/llviewercontrol.cpp
parent78abe4f5ffb02e14cd98f049b8100d20a82f3b1c (diff)
parent8bd5a3bca38b0ba663d3563029e54da057020424 (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 5daea96123..3bbd0e777f 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -411,9 +411,9 @@ bool handleHighResSnapshotChanged(const LLSD& newvalue)
bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
{
- if(gVoiceClient)
+ if(LLVoiceClient::getInstance())
{
- gVoiceClient->updateSettings();
+ LLVoiceClient::getInstance()->updateSettings();
}
return true;
}