diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:29:39 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:29:39 -0800 |
| commit | de23a4d92c02504fd512b2fdb151406d31ae03c0 (patch) | |
| tree | 09167a3f1a9bfd973f1167e99c1c5c8a26513299 /indra/llui/lldockablefloater.cpp | |
| parent | fb81795a2d009480482af13b536702002ed7c8f2 (diff) | |
| parent | dd9f2ca5f555d529d8f8b6168115ca3d3155fac7 (diff) | |
Merge
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); |