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

Display correct attempt to request region capabilities at startup

meow-7.2.2
Ansariel 2016-05-10 19:34:23 +02:00
parent d84caf3b1b
commit f57aa17882
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewerregion.cpp
View File

@ -273,17 +273,23 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCoro(U64 regionHandle)
}
S32 id = ++mHttpResponderID;
++mSeedCapAttempts;
// <FS:Ansariel> Increment after posting (progress showing wrong attempt otherwise)
//++mSeedCapAttempts;
LLSD capabilityNames = LLSD::emptyArray();
buildCapabilityNames(capabilityNames);
LL_INFOS("AppInit", "Capabilities") << "Requesting seed from " << url
<< " (attempt #" << mSeedCapAttempts << ")" << LL_ENDL;
// <FS:Ansariel> Increment after posting (progress showing wrong attempt otherwise)
// << " (attempt #" << mSeedCapAttempts << ")" << LL_ENDL;
<< " (attempt #" << mSeedCapAttempts + 1 << ")" << LL_ENDL;
regionp = NULL;
result = httpAdapter->postAndSuspend(httpRequest, url, capabilityNames);
// <FS:Ansariel> Increment after posting (progress showing wrong attempt otherwise)
++mSeedCapAttempts;
regionp = LLWorld::getInstance()->getRegionFromHandle(regionHandle);
if (!regionp) //region was removed
{