summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-08-20 14:04:53 -0700
committerAura Linden <aura@lindenlab.com>2014-08-20 14:04:53 -0700
commite77f33f8de63d2de2738f2e9af9cb797adc115c9 (patch)
tree7585663d1213ceeb9a8c6793197f83f5098b2b9c /indra/newview
parent86e2bd75bc6a04fa175a0ac9df51371498355f58 (diff)
Windows only.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvoicevivox.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 642c6c1f76..0387b18673 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -379,6 +379,7 @@ void LLVivoxVoiceClient::terminate()
{
logout();
connectorShutdown();
+#ifdef LL_WINDOWS
int count=0;
while (!mShutdownComplete && 10 > count++)
{
@@ -386,6 +387,7 @@ void LLVivoxVoiceClient::terminate()
_sleep(1000);
}
+#endif
closeSocket(); // Need to do this now -- bad things happen if the destructor does it later.
cleanUp();
}