diff options
author | Richard Linden <none@none> | 2012-01-16 11:03:33 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-01-16 11:03:33 -0800 |
commit | cd4204b2730350eede126190814621b65308c422 (patch) | |
tree | 264b81593d9cabd93450e29cbcb0ffdaec8eac58 /indra/llui/llresizebar.cpp | |
parent | 5e5105bd223f5180bbca634ba2c393be2ef3d13d (diff) |
EXP-1758 WIP Progress spinner not shown during merketplace synch if Merchant Outbox floater was previously minimized
rewrote layout_stack resizing logic to be symmetrical
Diffstat (limited to 'indra/llui/llresizebar.cpp')
-rw-r--r-- | indra/llui/llresizebar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp index 02f60c76fa..87aeb4d7a7 100644 --- a/indra/llui/llresizebar.cpp +++ b/indra/llui/llresizebar.cpp @@ -79,6 +79,8 @@ LLResizeBar::LLResizeBar(const LLResizeBar::Params& p) BOOL LLResizeBar::handleMouseDown(S32 x, S32 y, MASK mask) { + if (!canResize()) return FALSE; + // Route future Mouse messages here preemptively. (Release on mouse up.) // No handler needed for focus lost since this clas has no state that depends on it. gFocusMgr.setMouseCapture( this ); @@ -243,7 +245,7 @@ BOOL LLResizeBar::handleHover(S32 x, S32 y, MASK mask) handled = TRUE; } - if( handled ) + if( handled && canResize() ) { switch( mSide ) { |