diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-22 16:19:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-22 16:19:02 -0400 |
| commit | dda139f476b6a457f7f9558c1dc82b009d4ba7a6 (patch) | |
| tree | 6607c00db4443b8753e6fb75ec7ca0917d3d7b88 /indra/newview/lltexturectrl.cpp | |
| parent | d8a5736b82104f82085169c96ea289fd875b8bdf (diff) | |
| parent | 663102b5727cdd566f35a1fe5d113207ac75da62 (diff) | |
merge another batch of changes from windlight integration repo
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... |