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/llresizehandle.cpp | |
| parent | fb81795a2d009480482af13b536702002ed7c8f2 (diff) | |
| parent | dd9f2ca5f555d529d8f8b6168115ca3d3155fac7 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llresizehandle.cpp')
| -rw-r--r-- | indra/llui/llresizehandle.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp index 7449c339a0..6239a8f721 100644 --- a/indra/llui/llresizehandle.cpp +++ b/indra/llui/llresizehandle.cpp @@ -135,6 +135,12 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) LLView* resizing_view = getParent(); if( resizing_view ) { + // undock floater when user resize it + if (((LLFloater*)getParent())->isDocked()) + { + ((LLFloater*)getParent())->setDocked(false, false); + } + // Resize the parent LLRect orig_rect = resizing_view->getRect(); LLRect scaled_rect = orig_rect; |