diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-09-14 07:24:20 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-09-14 07:24:20 +0300 |
| commit | 14a6afea84c1fcdabb0282428d143692062463e8 (patch) | |
| tree | 94785e6ded080975911bc8179f34a317cda8a000 /indra | |
| parent | 983a227d590c7cd305508b527c259ae7e4742c22 (diff) | |
| parent | f65c8e631cf226d44182994e38205d19bd960fe5 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index a754e857ac..25df528d89 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -782,15 +782,13 @@ bool LLVivoxVoiceClient::provisionVoiceAccount() llcoro::suspend(); } - LLViewerRegion *region = gAgent.getRegion(); - - while (!region->capabilitiesReceived()) + while (!gAgent.getRegion()->capabilitiesReceived()) { // *TODO* Pump a message for wake up. llcoro::suspend(); } - std::string url = region->getCapability("ProvisionVoiceAccountRequest"); + std::string url = gAgent.getRegionCapability("ProvisionVoiceAccountRequest"); LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID); LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t |