diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:24:41 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:24:41 -0800 |
| commit | dd9f2ca5f555d529d8f8b6168115ca3d3155fac7 (patch) | |
| tree | 5c73fc1f5275df0c5546f2bc1dc85e0f4e83e40f /indra/llui/lldockablefloater.cpp | |
| parent | becfbd2b8295e3007fe151cd9b69d0af139040e2 (diff) | |
| parent | a27706ad2e42718ad107e25fe7c29f1c0513fabc (diff) | |
Merge from 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); |