diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2007-10-22 18:17:47 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2007-10-22 18:17:47 +0000 |
| commit | 94bcd2c47d7ba25693ae582e71e028142d3bc13b (patch) | |
| tree | 058dd54f0085351cc9ffc35901efb1a221a56745 /indra/newview/llvoiceclient.cpp | |
| parent | aa8b0cbe690eef9ed4fb7f6f9e8cc75a0a073d76 (diff) | |
svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expire-group-voice-channels -> release. Reverted 2 changes from the merge that were useless code.
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 3a74f1661b..f6f7ce7d5b 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -3954,8 +3954,10 @@ void LLVoiceClient::notifyStatusObservers(LLVoiceClientStatusObserver::EStatusTy { switch(mVivoxErrorStatusCode) { - case 20713: status = LLVoiceClientStatusObserver::ERROR_CHANNEL_FULL; break; - case 20714: status = LLVoiceClientStatusObserver::ERROR_CHANNEL_LOCKED; break; + case 20713: status = LLVoiceClientStatusObserver::ERROR_CHANNEL_FULL; break; + case 20714: status = LLVoiceClientStatusObserver::ERROR_CHANNEL_LOCKED; break; + case 20715: status = LLVoiceClientStatusObserver::ERROR_NOT_AVAILABLE; + break; } // Reset the error code to make sure it won't be reused later by accident. |