MAINT-4857 FIXED Reset scene monitor after completing teleport.

1 files changed, 6 insertions, 2 deletions

diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h
index 5bde3b5aab..2b6ea57b96 100644
--- a/indra/newview/llscenemonitor.h
+++ b/indra/newview/llscenemonitor.h
@@ -64,10 +64,12 @@ public:
 	void dumpToFile(std::string file_name);
 	bool hasResults() const { return mSceneLoadRecording.getResults().getDuration() != S32Seconds(0);}
 
+	void reset();
+
 private:
 	void freezeScene();
 	void unfreezeScene();
-	void reset();
+
 	LLRenderTarget& getCaptureTarget();
 	void generateDitheringTexture(S32 width, S32 height);
 
@@ -109,7 +111,7 @@ class LLSceneMonitorView : public LLFloater
 {
 public:
 	LLSceneMonitorView(const LLRect& rect);
-
+	~LLSceneMonitorView();
 	virtual void draw();
 
 	virtual void onVisibilityChange(BOOL visible);
@@ -117,6 +119,8 @@ public:
 protected:
 	virtual void onClose(bool app_quitting=false);
 	virtual void onClickCloseBtn(bool app_quitting=false);
+	void onTeleportFinished();
+	boost::signals2::connection sTeleportFinishConnection;
 };
 
 extern LLSceneMonitorView* gSceneMonitorView;