From b7edc965bc77ab21e9a1e3f6b424299a50053529 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Tue, 19 Nov 2013 16:32:41 -0500
Subject: STORM-68 Place initial call to send cap in new, better location. Make
 processing of debug setting names a little more elegant.

---
 indra/newview/llagent.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/llagent.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 3870a3be2e..f9301b61a1 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -737,6 +737,9 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
 
 			// Update all of the regions.
 			LLWorld::getInstance()->updateAgentOffset(mAgentOriginGlobal);
+
+			// Send default object permissions to simulator
+			LLFloaterPermsDefault::updateCap(false);
 		}
 
 		// Pass new region along to metrics components that care about this level of detail.
-- 
cgit v1.2.3


From 176901422f0122dad8d1e4e423d0bc19e9e4ad8a Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 20 Nov 2013 10:21:41 -0500
Subject: STORM-68 Reapply changes to inventory processing lost in the merge.
 Move call to updateCap back to where it was.  The place it was moved to was
 too early in the login sequence and was causing a crash.

---
 indra/newview/llagent.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/llagent.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7d2b4f6269..d210456993 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -898,9 +898,6 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
 
 			// Update all of the regions.
 			LLWorld::getInstance()->updateAgentOffset(mAgentOriginGlobal);
-
-			// Send default object permissions to simulator
-			LLFloaterPermsDefault::updateCap(false);
 		}
 
 		// Pass new region along to metrics components that care about this level of detail.
-- 
cgit v1.2.3


From c23aebf89d678fdbd27ac12b92dabb22c0822166 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Wed, 26 Feb 2014 12:50:43 +0200
Subject: MAINT-3746 FIXED After replacing
 LLEnvManagerNew::setRegionChangeCallback with
 LLAgent::addRegionChangedCallback we should call RegionChanged callbacks to
 update NavMesh status.

---
 indra/newview/llagent.cpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'indra/newview/llagent.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index f150ceda67..27d2a92f77 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -850,12 +850,9 @@ boost::signals2::connection LLAgent::addParcelChangedCallback(parcel_changed_cal
 //-----------------------------------------------------------------------------
 void LLAgent::setRegion(LLViewerRegion *regionp)
 {
-	bool notifyRegionChange;
-	
 	llassert(regionp);
 	if (mRegionp != regionp)
 	{
-		notifyRegionChange = true;
 		
 		std::string ip = regionp->getHost().getString();
 		LL_INFOS("AgentLocation") << "Moving agent into region: " << regionp->getName()
@@ -908,10 +905,7 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
 		// Pass new region along to metrics components that care about this level of detail.
 		LLAppViewer::metricsUpdateRegion(regionp->getHandle());
 	}
-	else
-	{
-		notifyRegionChange = false;
-	}
+
 	mRegionp = regionp;
 
 	// TODO - most of what follows probably should be moved into callbacks
@@ -947,11 +941,8 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
 		mRegionp->setCapabilitiesReceivedCallback(boost::bind(&LLAgent::handleServerBakeRegionTransition,this,_1));
 	}
 
-	if (notifyRegionChange)
-	{
-		LL_DEBUGS("AgentLocation") << "Calling RegionChanged callbacks" << LL_ENDL;
-		mRegionChangedSignal();
-	}
+	LL_DEBUGS("AgentLocation") << "Calling RegionChanged callbacks" << LL_ENDL;
+	mRegionChangedSignal();
 }
 
 
-- 
cgit v1.2.3


From 09d1c27d4f78c78d949b6a3d896d6f58df2dfc06 Mon Sep 17 00:00:00 2001
From: "maxim@mnikolenko" <maxim@mnikolenko>
Date: Fri, 14 Mar 2014 12:21:25 +0200
Subject: MAINT-3822 FIXED Show busy mode message only once for each im
 session.

---
 indra/newview/llagent.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llagent.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index f150ceda67..7a93a95ebf 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1466,6 +1466,7 @@ void LLAgent::setDoNotDisturb(bool pIsDoNotDisturb)
 	{
 		LLDoNotDisturbNotificationStorage::getInstance()->updateNotifications();
 	}
+	gIMMgr->updateDNDMessageStatus();
 }
 
 //-----------------------------------------------------------------------------
-- 
cgit v1.2.3