diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-24 14:39:39 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-24 14:39:39 -0500 |
| commit | c812c616ea0ba6531b3fe7f75efc815081cd0c2e (patch) | |
| tree | 2d966b5ba9fae58a3369055fadd6192b417c7f46 /indra/llui/llresizebar.cpp | |
| parent | fc6cfc27bec61ac1f66c1304cc7b54f19157584e (diff) | |
| parent | a22bb00530bb779d8e5bb40b68e55767604d88dc (diff) | |
merge
--HG--
branch : avatar-pipeline
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; |