summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-28 17:19:20 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-28 17:19:20 +0100
commit24a867a646a979d48cf5f4c94eae041507a09310 (patch)
tree5f963caa5c9fd69e3ef0669220cc736cf472d8a4 /indra/newview/llvoiceclient.cpp
parent176b5c5a67c3bd34da787c7446d7349dc1937803 (diff)
parent7983de22074beb25a832f89aa3e7a9728baca328 (diff)
Merged from ssh://hg.lindenlab.com/dessie/viewer-private
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rw-r--r--indra/newview/llvoiceclient.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 3a51f51c52..76cf7ad3dd 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -113,7 +113,10 @@ std::string LLVoiceClientStatusObserver::status2string(LLVoiceClientStatusObserv
///////////////////////////////////////////////////////////////////////////////////////////////
-LLVoiceClient::LLVoiceClient() :
+LLVoiceClient::LLVoiceClient()
+ :
+ mVoiceModule(NULL),
+ m_servicePump(NULL),
mVoiceModule(NULL),
mVoiceEffectEnabled(LLCachedControl<bool>(gSavedSettings, "VoiceMorphingEnabled")),
mVoiceEffectDefault(LLCachedControl<std::string>(gSavedPerAccountSettings, "VoiceEffectDefault"))