From 0eeea376628ea1e456aec81392ad6e708f573317 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 15 Jan 2013 03:31:57 +0100 Subject: [PATCH] Fix 'Open floater in Freeze Time mode' When the floater was opened in Freeze Time mode, then parent of the widget that triggers it to open is the 'Floater View'. We do NOT want to set that MouseOpaque :p. Using getParent here is just nonsense. --- indra/newview/llfloatersnapshot.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index a30dc7099..e92a2a28d 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1688,8 +1688,8 @@ void LLFloaterSnapshot::Impl::freezeTime(bool on) LLSnapshotLivePreview* previewp = getPreviewView(); if (on) { - // stop all mouse events at fullscreen preview layer - sInstance->getParent()->setMouseOpaque(TRUE); + // Stop all mouse events at fullscreen preview layer. + gSnapshotFloaterView->setMouseOpaque(TRUE); // can see and interact with fullscreen preview now if (previewp) @@ -1716,7 +1716,8 @@ void LLFloaterSnapshot::Impl::freezeTime(bool on) } else // turning off freeze frame mode { - sInstance->getParent()->setMouseOpaque(FALSE); + gSnapshotFloaterView->setMouseOpaque(FALSE); + if (previewp) { previewp->setVisible(FALSE);