From 593d6701d9c5ff2d686cd78b10268f59198b21db Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 5 Feb 2015 11:07:44 +0200
Subject: MAINT-4857 FIXED Reset scene monitor after completing teleport.

---
 indra/newview/llscenemonitor.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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

diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index 179a73413e..02912f12a9 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -39,6 +39,7 @@
 #include "llspatialpartition.h"
 #include "llagent.h"
 #include "pipeline.h"
+#include "llviewerparcelmgr.h"
 #include "llviewerpartsim.h"
 
 LLSceneMonitorView* gSceneMonitorView = NULL;
@@ -702,6 +703,13 @@ LLSceneMonitorView::LLSceneMonitorView(const LLRect& rect)
 	
 	setCanMinimize(false);
 	setCanClose(true);
+
+	sTeleportFinishConnection = LLViewerParcelMgr::getInstance()->setTeleportFinishedCallback(boost::bind(&LLSceneMonitorView::onTeleportFinished, this));
+}
+
+LLSceneMonitorView::~LLSceneMonitorView()
+{
+	sTeleportFinishConnection.disconnect();
 }
 
 void LLSceneMonitorView::onClose(bool app_quitting)
@@ -714,6 +722,14 @@ void LLSceneMonitorView::onClickCloseBtn(bool app_quitting)
 	setVisible(false);
 }
 
+void LLSceneMonitorView::onTeleportFinished()
+{
+	if(isInVisibleChain())
+	{
+		LLSceneMonitor::getInstance()->reset();
+	}
+}
+
 void LLSceneMonitorView::onVisibilityChange(BOOL visible)
 {
 	if (!LLGLSLShader::sNoFixedFunction && visible)
-- 
cgit v1.2.3