summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-07-08 10:53:39 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-07-08 10:53:39 -0400
commit7380d8f1cb9a40d1ca50d2c7675e08d270928947 (patch)
tree65082befbf725ff2e0fd4e465b7b67b43723a7e3 /indra
parentf3a8087de6ca3126ed5eb463ee72c59bb859d5e1 (diff)
EXT-8238 FIX - unfortunately this won't have much impact on crash rates, since the problem occurs when we're already shutting down
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerinventory.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 3430f265ae..1ff4d6db9e 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -625,7 +625,15 @@ bool LLViewerInventoryCategory::fetch()
// AIS folks are aware of the issue and have a fix in process.
// see ticket for details.
- std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents");
+ std::string url;
+ if (gAgent.getRegion())
+ {
+ url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents");
+ }
+ else
+ {
+ llwarns << "agent region is null" << llendl;
+ }
if (!url.empty()) //Capability found. Build up LLSD and use it.
{
LLInventoryModelBackgroundFetch::instance().start(mUUID, false);