diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-19 12:19:11 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-19 12:19:11 +0200 |
| commit | 58439da4c696f8dd6002e6399e4563cbda251a1e (patch) | |
| tree | 261b81d6f3492b020852a03f8b358aabfd040836 /indra/llui/llresizehandle.cpp | |
| parent | da2a0cfceb9fbc7c66f23f8820309f36b6629530 (diff) | |
| parent | 88cce61b09d225df0bcd8aab9dbd2c5a01ee7e19 (diff) | |
Merge
--HG--
branch : product-engine
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; |