diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-17 14:33:43 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-17 14:33:43 +0200 |
| commit | 2105e9c716458e64209cce29a15c6ad45d4d6f6d (patch) | |
| tree | 5867028e1606a473ca2e2f295c48daa2e5b35178 /indra/llui/lldockablefloater.cpp | |
| parent | 4c623cb7bb952ed034ce0457fef29c535ca8807e (diff) | |
| parent | d43e33400a2ef9d89ed6d13067055b5b1edbde78 (diff) | |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 10 |
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); |