From ebd157eac351bac11a70edfa454b73a8d5c6fbbb Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 27 Jan 2015 00:05:45 +0100
Subject: [PATCH] BUG-7748: Viewer is stuck in freeze frame after taking
 snapshot

---
 indra/newview/llfloatersnapshot.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 1b63b6a8fd..ed94352078 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1208,6 +1208,21 @@ void LLFloaterSnapshot::onOpen(const LLSD& key)
 void LLFloaterSnapshot::onClose(bool app_quitting)
 {
 	getParent()->setMouseOpaque(FALSE);
+
+	// <FS:Ansariel> BUG-7748: Viewer is stuck in freeze frame after taking snapshot
+	LLSnapshotLivePreview* previewp = impl.getPreviewView(this);
+	if (previewp)
+	{
+		previewp->setVisible(FALSE);
+		previewp->setEnabled(FALSE);
+	}
+	impl.mAvatarPauseHandles.clear();
+	gSavedSettings.setBOOL("FreezeTime", FALSE);
+	if (impl.mLastToolset)
+	{
+		LLToolMgr::getInstance()->setCurrentToolset(impl.mLastToolset);
+	}
+	// </FS:Ansariel>
 }
 
 // virtual