diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-11-28 11:34:53 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-11-28 11:34:53 -0700 |
| commit | fcd232e0fb9ebd18a1d3c967147232912425bc53 (patch) | |
| tree | bfb7a9213e8a3da483a42cc69f16fa1a9e185b3c /indra/newview | |
| parent | a375272ff5cabb97593129523d4e326cb3d0fda2 (diff) | |
| parent | 2851cd519338ef4a1fde15da8d4015ab4380d6cb (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 8ecf4a80b7..2d7437f4f3 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -7020,7 +7020,6 @@ void LLVivoxVoiceClient::captureBufferPlayStopSendMessage() LLVivoxProtocolParser::LLVivoxProtocolParser() { - parser = NULL; parser = XML_ParserCreate(NULL); reset(); |