diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
| commit | b9d6b5ef9a9797709397be983ec74c30cd1e0ce2 (patch) | |
| tree | 9886deac5d65ee1873e8c75ed2af62943c872f63 /indra/newview/lltexturectrl.cpp | |
| parent | 615cc856a8abf44f62c58962f8b53178f9708ee3 (diff) | |
| parent | ccb3ad90001c2b19cbd690d67317651ee0182f42 (diff) | |
Merge viewer-development -> mesh-development
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 1023a4339b..5b76537804 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1093,7 +1093,7 @@ public: BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask) { - getWindow()->setCursor(UI_CURSOR_HAND); + getWindow()->setCursor(mBorder->parentPointInView(x,y) ? UI_CURSOR_HAND : UI_CURSOR_ARROW); return TRUE; } @@ -1102,7 +1102,7 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask) { BOOL handled = LLUICtrl::handleMouseDown( x, y , mask ); - if( !handled ) + if (!handled && mBorder->parentPointInView(x, y)) { showPicker(FALSE); //grab textures first... |