summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-11-30 15:03:22 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-11-30 15:03:22 +0200
commitcaa0e333ed0cec59e6e1c6e570051584335bfca3 (patch)
treee741ff0dcd04e2d1c32382e64b59ee362b31aae4 /indra
parentc7a9cbc64660728d2c5afeb99c49674b0fcec9ab (diff)
MAINT-6970 FIXED Crash in LLFloaterPermsDefault::updateCap()
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterperms.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index b0b2770c6e..2281ea1496 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -183,6 +183,11 @@ void LLFloaterPermsDefault::sendInitialPerms()
void LLFloaterPermsDefault::updateCap()
{
+ if (!gAgent.getRegion())
+ {
+ LL_WARNS("Avatar") << "Region not set, cannot request capability update" << LL_ENDL;
+ return;
+ }
std::string object_url = gAgent.getRegion()->getCapability("AgentPreferences");
if(!object_url.empty())