diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-20 17:23:42 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-20 17:23:42 -0800 |
| commit | 92d725a10e5cf5b883a250bf60bebeb310b521de (patch) | |
| tree | b2b354c34ed6335b95111464766e75c45ec4000d /indra/llui/llresizebar.cpp | |
| parent | 3ea3f52aedd1efc568b01c8f618c5bbe805f61db (diff) | |
| parent | 90b72b1c71c71235fe963909eeadb6a079773a71 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llresizebar.cpp')
| -rw-r--r-- | indra/llui/llresizebar.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp index 304ac64f31..a7cf9be277 100644 --- a/indra/llui/llresizebar.cpp +++ b/indra/llui/llresizebar.cpp @@ -143,6 +143,12 @@ BOOL LLResizeBar::handleHover(S32 x, S32 y, MASK mask) if( valid_rect.localPointInRect( screen_x, screen_y ) && mResizingView ) { + // undock floater when user resize it + if (((LLFloater*)getParent())->isDocked()) + { + ((LLFloater*)getParent())->setDocked(false, false); + } + // Resize the parent LLRect orig_rect = mResizingView->getRect(); LLRect scaled_rect = orig_rect; |