summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-18 17:33:50 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2017-04-18 17:33:50 -0400
commit1ea0db76f60e4d90a846390f9480ae2ae2534fbb (patch)
tree335afeaa890724f3df7b1c84afca5f4d24410e97
parent3bb00a99e3277828d3c126574e4c676712bcf758 (diff)
SL-409 - Added a bit more logging in hopes of locating cause of increased crashes.
-rw-r--r--indra/newview/llviewerassetstorage.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 0ca896ce1a..c0fd0774f6 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -392,7 +392,14 @@ void LLViewerAssetStorage::queueRequestHttp(
void LLViewerAssetStorage::capsRecvForRegion(const LLUUID& region_id, std::string pumpname)
{
LLViewerRegion *regionp = LLWorld::instance().getRegionFromID(region_id);
- mViewerAssetUrl = regionp->getViewerAssetUrl();
+ if (!regionp)
+ {
+ LL_WARNS() << "region not found for region_id " << region_id << LL_ENDL;
+ }
+ else
+ {
+ mViewerAssetUrl = regionp->getViewerAssetUrl();
+ }
LLEventPumps::instance().obtain(pumpname).post(LLSD());
}
@@ -417,14 +424,18 @@ void LLViewerAssetStorage::assetRequestCoro(
}
else if (!gAgent.getRegion()->capabilitiesReceived())
{
+ LL_WARNS_ONCE() << "Waiting for capabilities" << LL_ENDL;
+
LLEventStream capsRecv("waitForCaps", true);
gAgent.getRegion()->setCapabilitiesReceivedCallback(
boost::bind(&LLViewerAssetStorage::capsRecvForRegion, this, _1, capsRecv.getName()));
llcoro::suspendUntilEventOn(capsRecv);
+ LL_WARNS_ONCE() << "capsRecv got event" << LL_ENDL;
+ LL_WARNS_ONCE() << "region " << gAgent.getRegion() << " mViewerAssetUrl " << mViewerAssetUrl << LL_ENDL;
}
- if (mViewerAssetUrl.empty())
+ if (mViewerAssetUrl.empty() && gAgent.getRegion())
{
mViewerAssetUrl = gAgent.getRegion()->getViewerAssetUrl();
}