summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-03-20 19:09:13 +0200
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-03-20 19:09:13 +0200
commit84bda8ea4dc2b7ab2a9c7e21921b379c775b704a (patch)
tree85c2f339b6b8ca86255dc5e6d3bf713219b2ba64 /indra
parent12b245c4ba540d339c0a21e738fe23d9032874a9 (diff)
MAINT-8363 Additional sanity checks
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerregion.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 101af1a60a..b128e2cd93 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -290,6 +290,13 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCoro(U64 regionHandle)
continue;
}
+ if (!result.isMap() || result.has("error"))
+ {
+ LL_WARNS("AppInit", "Capabilities") << "Malformed response" << LL_ENDL;
+ // setup for retry.
+ continue;
+ }
+
LLSD httpResults = result["http_result"];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
if (!status)