diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
| commit | d8f795aa9ceaae73ad8890a1110fa6b4045843c7 (patch) | |
| tree | 96bd0bbc9d7bbe2a6a8d9a543fc581d82fdc1965 /indra/newview/llviewerinventory.cpp | |
| parent | 9ae6672a15ae64dba1d2af774dcde26700fb6126 (diff) | |
| parent | 467a8b0441e139773775ecf306f430f44814bff5 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 10 |
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); |