summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnsariel <none@none>2016-07-14 10:28:54 +0200
committerAnsariel <none@none>2016-07-14 10:28:54 +0200
commitd2cf09e7d2fb3eefd4bed4e5341849ee940b9018 (patch)
tree11911019dc5b6a437be7cde81c4e1489640ce697
parentf868e29945806fd6cefde65067ae2c870ac112a6 (diff)
STORM-2133: VOICE-36 prevents proper shutdown of connector
-rwxr-xr-xdoc/contributions.txt1
-rw-r--r--indra/newview/llvoicevivox.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9b31e5032a..09575f15c1 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -190,6 +190,7 @@ Ansariel Hiller
STORM-2094
MAINT-5756
MAINT-4677
+ STORM-2133
Aralara Rajal
Arare Chantilly
CHUIBUG-191
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 07427e0377..189ed54993 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -427,7 +427,7 @@ void LLVivoxVoiceClient::connectorCreate()
void LLVivoxVoiceClient::connectorShutdown()
{
- if(!mConnectorEstablished)
+ if(mConnectorEstablished)
{
std::ostringstream stream;
stream