From cf6c07927d70db9976d2c47bb21552ba9b38c9b0 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 25 Sep 2015 12:51:44 -0700
Subject: There seemed to be an excess call to setInitialPerms, also cleaned up
 a ignored call to the environtment settings on login.

---
 indra/newview/llviewerregion.cpp | 14 +++++++++-----
 indra/newview/llwlhandlers.cpp   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 8c4a6935a6..b0280ef3e0 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -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();
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
index 8ecfeef2dc..87e8c3008e 100755
--- a/indra/newview/llwlhandlers.cpp
+++ b/indra/newview/llwlhandlers.cpp
@@ -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()
-- 
cgit v1.2.3