diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-03-09 09:08:02 -0500 |
| commit | aae241c43f66c3ef59cb076d00e42f9a857de354 (patch) | |
| tree | 82da2afc116915897a3207cc8eed120aef5ef3fd /indra/newview/llvoicevivox.cpp | |
| parent | 17bb7f4fc5463e9426179b0ded810b51ef291c79 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
merge changes for 5.1.2-release
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 93a176d435..8e46e08b14 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -888,14 +888,9 @@ bool LLVivoxVoiceClient::startAndLaunchDaemon() bool LLVivoxVoiceClient::provisionVoiceAccount() { LL_INFOS("Voice") << "Provisioning voice account." << LL_ENDL; - while (!gAgent.getRegion()) - { LL_DEBUGS("Voice") << "no region for voice provisioning; waiting " << LL_ENDL; - // *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()) { LL_DEBUGS("Voice") << "no capabilities for voice provisioning; waiting " << LL_ENDL; // *TODO* Pump a message for wake up. |