summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-09-12 17:13:11 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-09-12 17:13:11 +0300
commitf65c8e631cf226d44182994e38205d19bd960fe5 (patch)
tree0ced6497ac4bff9d640ebcc61eb6df7e67c4a87c
parent56f53cd9f5319ac0c3b45bd18a998bb10df928a3 (diff)
MAINT-7786 FIXED Crash in LLVivoxVoiceClient::provisionVoiceAccount()
-rw-r--r--indra/newview/llvoicevivox.cpp6
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