diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2009-11-25 09:42:58 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2009-11-25 09:42:58 -0800 |
| commit | bb614fa887ec7cadc5b370c1dcf412ae5cf662e1 (patch) | |
| tree | 2ee594428704e0f4774f717d71485ee0bdde8748 /indra/llui/llresizehandle.cpp | |
| parent | 6d66910c6e2fbb25bf8b5c7b90e795f350342104 (diff) | |
| parent | 57bc7dc44f31ef132a4abec228459c490c425eed (diff) | |
Merge of viewer 2
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; |