diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-06 13:09:48 -0800 |
commit | 78db8dd83b76466df83abc32d56aa74ac7b180f3 (patch) | |
tree | 369b4d8db3081fcf71a27572a00d310c7b9aaaf6 /indra/newview/lltoolpie.cpp | |
parent | d4f790f72866b43956ce4216bf6471c85f4afc6c (diff) | |
parent | 3f8172707833f30d3c39d165c975bd3d97511080 (diff) |
merge from remote repo
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r-- | indra/newview/lltoolpie.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 24017202cc..93da32b115 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -494,6 +494,8 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) } else if (handleMediaHover(mHoverPick)) { + // *NOTE: If you think the hover glow conflicts with the media outline, you + // could disable it here. show_highlight = true; // cursor set by media object lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl; |