diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-11-12 18:22:50 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-11-12 18:22:50 +0200 |
| commit | 01b8f09c197cb0309a74d8e7cb8c5299dff5f3a5 (patch) | |
| tree | 5be626eb39b85c2814cdac473aa27590e16353ac | |
| parent | e0425400ed151df2e9ccd4e2961e0d060695bd91 (diff) | |
MAINT-4660 FIXED making Photos
| -rwxr-xr-x | indra/newview/llfloatersnapshot.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 04329ff66e..43f6576dc9 100755 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1193,6 +1193,22 @@ void LLFloaterSnapshot::onOpen(const LLSD& key) void LLFloaterSnapshot::onClose(bool app_quitting) { getParent()->setMouseOpaque(FALSE); + + //unfreeze everything, hide fullscreen preview + LLSnapshotLivePreview* previewp = LLFloaterSnapshot::Impl::getPreviewView(this); + if (previewp) + { + previewp->setVisible(FALSE); + previewp->setEnabled(FALSE); + } + + gSavedSettings.setBOOL("FreezeTime", FALSE); + impl.mAvatarPauseHandles.clear(); + + if (impl.mLastToolset) + { + LLToolMgr::getInstance()->setCurrentToolset(impl.mLastToolset); + } } // virtual |