summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicevivox.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-12-06 17:48:01 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-12-06 17:48:01 +0200
commit84ea0ab778e486279d32c101f4d9f5377ef94109 (patch)
tree613b432b6f3567a8719fcc46b53bdd70486445e8 /indra/newview/llvoicevivox.cpp
parent34d3b49d1f6ae7e07d615cb1f98d5ad45fbb638d (diff)
MAINT-8042 Crash in LLViewerRegion::capabilitiesReceived()
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
-rw-r--r--indra/newview/llvoicevivox.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 25df528d89..025b315b1d 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -776,13 +776,8 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon()
bool LLVivoxVoiceClient::provisionVoiceAccount()
{
LL_INFOS("Voice") << "Provisioning voice account." << LL_ENDL;
- while (!gAgent.getRegion())
- {
- // *TODO* Set up a call back on agent that sends a message to a pump we can use to wake up.
- llcoro::suspend();
- }
- while (!gAgent.getRegion()->capabilitiesReceived())
+ while (!gAgent.getRegion() || !gAgent.getRegion()->capabilitiesReceived())
{
// *TODO* Pump a message for wake up.
llcoro::suspend();