diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-22 21:14:38 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-22 21:14:38 +0300 |
| commit | c7bca4602ef158f04c81f6b2bb42a2f190eca18e (patch) | |
| tree | 80617ba130d56fe076ce008df743209aec9c8c40 /indra | |
| parent | 94687fd05e356499c6708c4df6e11e85d075f992 (diff) | |
STORM-1305 WIP Fixed texture control to not display hand cursor outside of the texture.
Also click outside of the texture will not show the picker anymore.
Diffstat (limited to 'indra')
| -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... |