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

There seemed to be an excess call to setInitialPerms, also cleaned up a ignored call to the environtment settings on login.

meow-7.2.2
Rider Linden 2015-09-25 12:51:44 -07:00
parent bb8afb10d5
commit cf6c07927d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llviewerregion.cpp
View File

@ -310,6 +310,10 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCoro(U64 regionHandle)
<< "Capability '" << iter->first << "' is '" << iter->second << "'" << LL_ENDL;
}
#if 0
log_capabilities(mCapabilities);
#endif
regionp->setCapabilitiesReceived(true);
if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
@ -390,6 +394,10 @@ void LLViewerRegionImpl::requestBaseCapabilitiesCompleteCoro(U64 regionHandle)
//LL_INFOS()<<"BaseCapabilitiesCompleteTracker New Caps "<<iter->first<<" "<< iter->second<<LL_ENDL;
}
#if 0
log_capabilities(mCapabilities);
#endif
if (mCapabilities.size() != mSecondCapabilitiesTracker.size())
{
LL_WARNS("AppInit", "Capabilities")
@ -2939,11 +2947,7 @@ void LLViewerRegion::setCapability(const std::string& name, const std::string& u
}
else if(name == "UntrustedSimulatorMessage")
{
#if 1
mImpl->mHost.setUntrustedSimulatorCap(url);
#else
LLHTTPSender::setSender(mImpl->mHost, new LLCapHTTPSender(url));
#endif
}
else if (name == "SimulatorFeatures")
{
@ -3041,7 +3045,7 @@ void LLViewerRegion::setCapabilitiesReceived(bool received)
{
mCapabilitiesReceivedSignal(getRegionID());
LLFloaterPermsDefault::sendInitialPerms();
//LLFloaterPermsDefault::sendInitialPerms();
// This is a single-shot signal. Forget callbacks to save resources.
mCapabilitiesReceivedSignal.disconnect_all_slots();

2
indra/newview/llwlhandlers.cpp
View File

@ -126,7 +126,7 @@ void LLEnvironmentRequest::environmentRequestCoro(std::string url)
regionId = gAgent.getRegion()->getRegionID();
}
if (result[0]["regionID"].asUUID() != regionId)
if ((result[0]["regionID"].asUUID() != regionId) && regionId.notNull())
{
LL_WARNS("WindlightCaps") << "Not in the region from where this data was received (wanting "
<< regionId << " but got " << result[0]["regionID"].asUUID()