livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Brad Payne (Vir Linden) 2017-04-18 17:33:50 -04:00
parent 3bb00a99e3
commit 1ea0db76f6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llviewerassetstorage.cpp
View File

@ -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();
}