diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-02 23:18:28 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-02 23:18:28 +0300 |
commit | 3983f5b1e2d79602a7d685633271d824a906ed2f (patch) | |
tree | 145c7d100ce6ee0c38b0b0bae3fdedce294f95ed /indra/newview/lltoolpie.cpp | |
parent | 4cd59b3d8e43870264717ec145da14e34c6c717a (diff) | |
parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r-- | indra/newview/lltoolpie.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index f473000657..6a8843cb44 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -300,6 +300,8 @@ BOOL LLToolPie::handleLeftClickPick() } } return TRUE; + case CLICK_ACTION_DISABLED: + return TRUE; default: // nothing break; @@ -463,6 +465,8 @@ ECursorType LLToolPie::cursorFromObject(LLViewerObject* object) case CLICK_ACTION_OPEN_MEDIA: cursor = cursor_from_parcel_media(click_action); break; + case CLICK_ACTION_DISABLED: + break; default: break; } @@ -528,6 +532,8 @@ void LLToolPie::selectionPropertiesReceived() case CLICK_ACTION_OPEN: LLFloaterReg::showInstance("openobject"); break; + case CLICK_ACTION_DISABLED: + break; default: break; } |