diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-05-28 18:46:22 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-05-28 18:46:22 +0100 |
| commit | fd98253aecb4a26a9a41cf5b2af0802a1b9e19d5 (patch) | |
| tree | a58e0bfa8667e6db29a9def55d005d56603c9d43 /indra/newview/llvoiceclient.cpp | |
| parent | 24a867a646a979d48cf5f4c94eae041507a09310 (diff) | |
Fix borked merge, DOH!
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 76cf7ad3dd..e8635d7f1a 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -117,7 +117,6 @@ LLVoiceClient::LLVoiceClient() : mVoiceModule(NULL), m_servicePump(NULL), - mVoiceModule(NULL), mVoiceEffectEnabled(LLCachedControl<bool>(gSavedSettings, "VoiceMorphingEnabled")), mVoiceEffectDefault(LLCachedControl<std::string>(gSavedPerAccountSettings, "VoiceEffectDefault")) { |