summaryrefslogtreecommitdiff
path: root/indra/llui/lldockablefloater.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-11-17 14:33:07 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-11-17 14:33:07 +0200
commitd43e33400a2ef9d89ed6d13067055b5b1edbde78 (patch)
treefbe8c90595e6b629723fb2cde6d682eb21dbb9a4 /indra/llui/lldockablefloater.cpp
parent4b80c9978c48b6a9eaac2ed358e81cf06f3e2cb5 (diff)
implemented EXT-2515 "Docked floaters should be resizeable";
--HG-- branch : product-engine
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
-rw-r--r--indra/llui/lldockablefloater.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index c3dd4ae647..9be3d49023 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -217,6 +217,16 @@ void LLDockableFloater::draw()
LLFloater::draw();
}
+void LLDockableFloater::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+ if (isDocked())
+ {
+ setDocked(false);
+ }
+
+ LLFloater::reshape(width, height, called_from_parent);
+}
+
void LLDockableFloater::setDockControl(LLDockControl* dockControl)
{
mDockControl.reset(dockControl);