summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorrider <rider@lindenlab.com>2016-01-07 09:20:11 -0800
committerrider <rider@lindenlab.com>2016-01-07 09:20:11 -0800
commitcdde5d0f03f8b283e54269fa879bbbc685fe98da (patch)
treec6b65b709e228c51d5b04010d9a8cea4bf44175f /indra/newview
parent7692e9554d5fb481c3cf8e24d10fa542a3a9ec9d (diff)
MAINT-5976: No sleep for mac on shutdown.
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 9eebabd89b..a43e90d85d 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1160,11 +1160,13 @@ bool LLVivoxVoiceClient::breakVoiceConnection(bool corowait)
else
{ // If we are not doing a corowait then we must sleep until the connector has responded
// otherwise we may very well close the socket too early.
+#ifdef LL_WINDOWS
int count = 0;
while (!mShutdownComplete && 10 > count++)
{
_sleep(1000);
}
+#endif
}
closeSocket(); // Need to do this now -- bad things happen if the destructor does it later.