summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2009-12-21 18:12:17 -0800
committerrichard <none@none>2009-12-21 18:12:17 -0800
commit18e25641fecd526cd2a2bb074311056101b3456a (patch)
tree3ff89da9566a7f7b602b201d19bda7ff43c99134 /indra/newview/llfloatersnapshot.cpp
parente6a8b3e2b2b3a352c674a788d27ac2d5f35983f8 (diff)
parent5b978865e3b09e5b911728cd6381a2a4a7b3a9d3 (diff)
merge
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
-rw-r--r--indra/newview/llfloatersnapshot.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index dbecd45d1f..f53b62e490 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1379,7 +1379,6 @@ void LLFloaterSnapshot::Impl::onClickDiscard(void* data)
if (view)
{
- view->getParent()->setMouseOpaque(FALSE);
view->closeFloater();
}
}
@@ -2105,6 +2104,12 @@ void LLFloaterSnapshot::onOpen(const LLSD& key)
gSnapshotFloaterView->adjustToFitScreen(this, FALSE);
}
+void LLFloaterSnapshot::onClose(bool app_quitting)
+{
+ getParent()->setMouseOpaque(FALSE);
+}
+
+
//static
void LLFloaterSnapshot::update()
{