From ae0827d387dc1e4d0f8a749cab36138f8ac174a0 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 7 Oct 2009 07:09:34 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1908
 https://svn.aws.productengine.com/secondlife/pe/stable-2@1917 ->
 viewer-2.0.0-3 * Bugs: EXT-1257 EXT-1299 EXT-1149 EXT-1117 EXT-1134 * New
 Dev: EXT-721

---
 indra/llui/lldockablefloater.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'indra/llui/lldockablefloater.cpp')

diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index 4525f0a45b..c512ef25be 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -91,6 +91,16 @@ void LLDockableFloater::setVisible(BOOL visible)
 	LLFloater::setVisible(visible);
 }
 
+void LLDockableFloater::onDockHidden()
+{
+	setCanDock(FALSE);
+}
+
+void LLDockableFloater::onDockShown()
+{
+	setCanDock(TRUE);
+}
+
 void LLDockableFloater::setDocked(bool docked, bool pop_on_undock)
 {
 	if (mDockControl.get() != NULL && mDockControl.get()->isDockVisible())
-- 
cgit v1.3