diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-20 19:24:07 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-20 19:24:07 +0200 |
| commit | d0c1593d85cd26ad822d31e21df7a1864d66541c (patch) | |
| tree | 30ceb3cfc19ccb36b7bcc7f0e5a2ad3efdd38747 /indra/llui/llresizebar.cpp | |
| parent | 9d64bf132e27739dedeca17a1d952655c6b52ac3 (diff) | |
| parent | 0c468557b9e38ec4be201fa991499ed095a4d8c3 (diff) | |
Merge
--HG--
branch : 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; |