diff options
| author | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
| commit | 6e5f529a7adb53fa021986aed6e6b1b229cc0efd (patch) | |
| tree | a031044cfb6618a5b36a0e80d0fc3a918dfa07a9 /indra/llui/llresizehandle.cpp | |
| parent | a35fbddb910fa0dd068622c3dc64af1b27ca19b7 (diff) | |
| parent | 81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff) | |
branch 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; |