aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorthickbrick2010-11-20 14:13:19 +0200
committerthickbrick2010-11-20 14:13:19 +0200
commit1d15c37689b15b2005ff97738e259d63b7e6c446 (patch)
treec6d1e8de062d8cd6dac3eb04241417ef89ea6110 /linden/indra
parentPartial fix #614: wrong calculation of thread run time (diff)
downloadmeta-impy-1d15c37689b15b2005ff97738e259d63b7e6c446.zip
meta-impy-1d15c37689b15b2005ff97738e259d63b7e6c446.tar.gz
meta-impy-1d15c37689b15b2005ff97738e259d63b7e6c446.tar.bz2
meta-impy-1d15c37689b15b2005ff97738e259d63b7e6c446.tar.xz
Fix #705 (SNOW-717): Prevent mouse cursor flicker
Patch by Lance Corrimal taken from SNOW-717.
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/lltoolpie.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 296d1bb..34735a3 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -645,8 +645,6 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
645 } 645 }
646 */ 646 */
647 647
648
649 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
650 648
651 LLViewerObject *object = NULL; 649 LLViewerObject *object = NULL;
652 LLViewerObject *parent = NULL; 650 LLViewerObject *parent = NULL;
@@ -697,9 +695,14 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
697 { 695 {
698 gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND); 696 gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
699 } 697 }
698 else
699 {
700 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
701 }
700 } 702 }
701 else 703 else
702 { 704 {
705 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
703 // We need to clear media hover flag 706 // We need to clear media hover flag
704 if (LLViewerMediaFocus::getInstance()->getMouseOverFlag()) 707 if (LLViewerMediaFocus::getInstance()->getMouseOverFlag())
705 { 708 {