diff options
| author | Richard Linden <none@none> | 2012-01-17 11:55:19 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-17 11:55:19 -0800 |
| commit | facb0fa42cf7dbc4deb3a4026cc216aa0099111e (patch) | |
| tree | a96bb9bb96ddd26173174de9383c851cc356b110 /indra/llui/llresizebar.cpp | |
| parent | 64c45cbd1ace677456db56d1a506f2fe44b6e9c6 (diff) | |
| parent | 1f9529c0c2b02c4ceee912f8ecb35181174cc7cc (diff) | |
merge with viewer-development
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 ) { |