diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
| commit | 6e0770908dc151b09a2863b95dc0c132d242acc0 (patch) | |
| tree | c72c7070cc0438dc4165ef8d5c6b329fc16448b5 /indra/newview/lltoolpie.cpp | |
| parent | f55af5fcdfdd0b4520e382d315afefd41c534820 (diff) | |
| parent | 61657d2e7904ba7274a0ab5d451669d2ee7bb7cc (diff) | |
Manual merge from default branch
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 8d4f0f9116..b7947cf4ae 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -497,6 +497,8 @@ void LLToolPie::selectionPropertiesReceived() BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) { mHoverPick = gViewerWindow->pickImmediate(x, y, FALSE); + // perform a separate pick that detects transparent objects since they respond to 1-click actions + LLPickInfo click_action_pick = gViewerWindow->pickImmediate(x, y, TRUE); // Show screen-space highlight glow effect bool show_highlight = false; @@ -508,10 +510,11 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask) parent = object->getRootEdit(); } - if (object && useClickAction(mask, object, parent)) + LLViewerObject* click_action_object = click_action_pick.getObject(); + if (click_action_object && useClickAction(mask, click_action_object, click_action_object->getRootEdit())) { show_highlight = true; - ECursorType cursor = cursor_from_object(object); + ECursorType cursor = cursor_from_object(click_action_object); gViewerWindow->setCursor(cursor); lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl; } |