Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions indra/newview/llviewerregion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -390,17 +390,31 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCoro(U64 regionHandle)

LL_DEBUGS("AppInit", "Capabilities", "Teleport") << "received caps for handle " << regionHandle
<< " region name " << regionp->getName() << LL_ENDL;
regionp->setCapabilitiesReceived(true);
// setCapabilitiesReceived moved to postToMainCoro below

break;
}
while (true);

if (regionp && regionp->isCapabilityAvailable("ServerReleaseNotes") &&
regionp->getReleaseNotesRequested())
{ // *HACK: we're waiting for the ServerReleaseNotes
regionp->showReleaseNotes();
}
LLAppViewer::instance()->postToMainCoro(
[regionHandle]()
{
if (!LLWorld::instanceExists())
{
return;
}
LLViewerRegion* regionp = LLWorld::getInstance()->getRegionFromHandle(regionHandle);
if (!regionp)
{
return;
}
regionp->setCapabilitiesReceived(true);
if (regionp->isCapabilityAvailable("ServerReleaseNotes") &&
regionp->getReleaseNotesRequested())
{ // *HACK: we're waiting for the ServerReleaseNotes
regionp->showReleaseNotes();
}
});
}


Expand Down