diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-18 11:35:11 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-18 11:35:11 +0200 |
| commit | 215b95eb64ebea58d6f2bda5f90e307836aca093 (patch) | |
| tree | ad655f4b231eed07b163db8f07911755cf287b09 /indra/llui/lldockablefloater.cpp | |
| parent | c76ab6c4b7384e34a4f32f2fa820b46f6373cdc3 (diff) | |
related to EXT-2515 "Docked floaters should be resizeable"
avoid undock floater when resize initiated not by user
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 9a2f2ab4d3..9c69e4f2b6 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -206,16 +206,6 @@ 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); |
