From 94bcd2c47d7ba25693ae582e71e028142d3bc13b Mon Sep 17 00:00:00 2001 From: Jon Wolk Date: Mon, 22 Oct 2007 18:17:47 +0000 Subject: 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. --- indra/newview/llvoiceclient.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/llvoiceclient.cpp') 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. -- cgit v1.2.3