summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2009-12-22 17:49:35 +0200
committerIgor Borovkov <iborovkov@productengine.com>2009-12-22 17:49:35 +0200
commit191e5f9ca033cd1520950f35309c0bc2c4499803 (patch)
tree684ccc50f33104413f9c52fe2ee4c3302ec77bb6 /indra/newview/llfloatersnapshot.cpp
parent304e321f89e9a517ba90d6b41999a65591639ad9 (diff)
parentd4a8f4c6efd11b4cb3ccba320f18e8508668b915 (diff)
merge
--HG-- branch : product-engine
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()
{