1 files changed, 12 insertions, 0 deletions

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 07d2fa9..3cf15fc 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1051,6 +1051,11 @@ void LLVoiceClientCapResponder::result(const LLSD& content)
 
                 gVoiceClient->setSpatialChannel(uri, credentials, mResponseID);
         }
+        else
+        {
+                llwarns << "ParcelVoiceInfoRequest response malformed, disabling voice." << llendl;
+                gVoiceClient->close();
+        }
 }
 
 
@@ -1771,11 +1776,13 @@ void LLVoiceClient::close()
 {
         LL_DEBUGS("VoiceSession") << "Cancel Session: LLVoiceClient::close() called."
                                 << llendl;
+        mAccountActive = false;
         setState(stateDisableCleanup);
 }
 
 void LLVoiceClient::start()
 {
+        mAccountActive = true;
         setState(stateStart);
 }
 
@@ -7207,6 +7214,11 @@ class LLViewerParcelVoiceInfo : public LLHTTPNode
                                 gVoiceClient->setPIRCapResponseID(response_id);
                                 gVoiceClient->setSpatialChannel(uri, credentials, response_id);
                         }
+                        else
+                        {
+                                llwarns << "ParcelVoiceInfoRequest response malformed, disabling voice." << llendl;
+                                gVoiceClient->close();
+                        }
                 }
         }
 };