diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-20 14:43:58 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-20 14:43:58 -0800 |
| commit | 0bdf520f4f399e1a368893db066d829b0ae3890e (patch) | |
| tree | feb30880a5573ac39b2f7b360fce3835dec50569 /indra/llui/llresizebar.cpp | |
| parent | 3bb86f91bc345f74057debe1f8f680098895a40e (diff) | |
| parent | c9101f603a7969f4d46a7d8d911fa8805d926548 (diff) | |
Merge from product-engine
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; |