Skip to content
Snippets Groups Projects
Commit 1ea0db76 authored by Brad Payne (Vir Linden)'s avatar Brad Payne (Vir Linden)
Browse files

SL-409 - Added a bit more logging in hopes of locating cause of increased crashes.

parent 3bb00a99
Branches
Tags
No related merge requests found
...@@ -392,7 +392,14 @@ void LLViewerAssetStorage::queueRequestHttp( ...@@ -392,7 +392,14 @@ void LLViewerAssetStorage::queueRequestHttp(
void LLViewerAssetStorage::capsRecvForRegion(const LLUUID& region_id, std::string pumpname) void LLViewerAssetStorage::capsRecvForRegion(const LLUUID& region_id, std::string pumpname)
{ {
LLViewerRegion *regionp = LLWorld::instance().getRegionFromID(region_id); LLViewerRegion *regionp = LLWorld::instance().getRegionFromID(region_id);
if (!regionp)
{
LL_WARNS() << "region not found for region_id " << region_id << LL_ENDL;
}
else
{
mViewerAssetUrl = regionp->getViewerAssetUrl(); mViewerAssetUrl = regionp->getViewerAssetUrl();
}
LLEventPumps::instance().obtain(pumpname).post(LLSD()); LLEventPumps::instance().obtain(pumpname).post(LLSD());
} }
...@@ -417,14 +424,18 @@ void LLViewerAssetStorage::assetRequestCoro( ...@@ -417,14 +424,18 @@ void LLViewerAssetStorage::assetRequestCoro(
} }
else if (!gAgent.getRegion()->capabilitiesReceived()) else if (!gAgent.getRegion()->capabilitiesReceived())
{ {
LL_WARNS_ONCE() << "Waiting for capabilities" << LL_ENDL;
LLEventStream capsRecv("waitForCaps", true); LLEventStream capsRecv("waitForCaps", true);
gAgent.getRegion()->setCapabilitiesReceivedCallback( gAgent.getRegion()->setCapabilitiesReceivedCallback(
boost::bind(&LLViewerAssetStorage::capsRecvForRegion, this, _1, capsRecv.getName())); boost::bind(&LLViewerAssetStorage::capsRecvForRegion, this, _1, capsRecv.getName()));
llcoro::suspendUntilEventOn(capsRecv); 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(); mViewerAssetUrl = gAgent.getRegion()->getViewerAssetUrl();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment