From ca6121979c6716aaf986fc6d0d469383471469f4 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 4 Feb 2021 18:06:17 +0200
Subject: SL-14796 Updated code accordingly to changed event order

---
 indra/newview/llagent.cpp | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index f31135ad4c..3c50493d79 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -387,6 +387,7 @@ LLAgent::LLAgent() :
 	mTeleportFinishedSlot(),
 	mTeleportFailedSlot(),
 	mIsMaturityRatingChangingDuringTeleport(false),
+	mTPNeedsNeabyChatSeparator(false),
 	mMaturityRatingChange(0U),
 	mIsDoSendMaturityPreferenceToServer(false),
 	mMaturityPreferenceRequestId(0U),
@@ -519,10 +520,6 @@ void LLAgent::cleanup()
 	{
 		mTeleportFailedSlot.disconnect();
 	}
-    if (mParcelMgrConnection.connected())
-    {
-        mParcelMgrConnection.disconnect();
-    }
 }
 
 //-----------------------------------------------------------------------------
@@ -3938,10 +3935,7 @@ void LLAgent::clearTeleportRequest()
         LLVoiceClient::getInstance()->setHidden(FALSE);
     }
 	mTeleportRequest.reset();
-    if (mParcelMgrConnection.connected())
-    {
-        mParcelMgrConnection.disconnect();
-    }
+    mTPNeedsNeabyChatSeparator = false;
 }
 
 void LLAgent::setMaturityRatingChangeDuringTeleport(U8 pMaturityRatingChange)
@@ -3953,7 +3947,7 @@ void LLAgent::setMaturityRatingChangeDuringTeleport(U8 pMaturityRatingChange)
 void LLAgent::sheduleTeleportIM()
 {
     // is supposed to be called during teleport so we are still waiting for parcel
-    mParcelMgrConnection = addParcelChangedCallback(onParcelReadyAfterTeleport);
+    mTPNeedsNeabyChatSeparator = true;
 }
 
 bool LLAgent::hasPendingTeleportRequest()
@@ -4003,6 +3997,12 @@ void LLAgent::startTeleportRequest()
 void LLAgent::handleTeleportFinished()
 {
     LL_INFOS("Teleport") << "Agent handling teleport finished." << LL_ENDL;
+    if (mTPNeedsNeabyChatSeparator)
+    {
+        // parcel is ready at this point
+        addTPNearbyChatSeparator();
+        mTPNeedsNeabyChatSeparator = false;
+    }
 	clearTeleportRequest();
     mTeleportCanceled.reset();
 	if (mIsMaturityRatingChangingDuringTeleport)
@@ -4066,14 +4066,11 @@ void LLAgent::handleTeleportFailed()
 		mIsMaturityRatingChangingDuringTeleport = false;
 	}
 
-    if (mParcelMgrConnection.connected())
-    {
-        mParcelMgrConnection.disconnect();
-    }
+    mTPNeedsNeabyChatSeparator = false;
 }
 
 /*static*/
-void LLAgent::onParcelReadyAfterTeleport()
+void LLAgent::addTPNearbyChatSeparator()
 {
     LLViewerRegion* agent_region = gAgent.getRegion();
     LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
@@ -4106,11 +4103,6 @@ void LLAgent::onParcelReadyAfterTeleport()
         args["do_not_log"] = TRUE;
         nearby_chat->addMessage(chat, true, args);
     }
-
-    if (gAgent.mParcelMgrConnection.connected())
-    {
-        gAgent.mParcelMgrConnection.disconnect();
-    }
 }
 
 /*static*/
-- 
cgit v1.2.3