summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2018-08-02 21:54:09 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2018-08-02 21:54:09 +0100
commit6ce09ad712f98fe5d0097f1de6a5d1793f5f2bdd (patch)
tree0d4ca8e3d55647d713447b0d865c75565e6458cf /indra/newview/lltoolpie.cpp
parentac889b1eeb7f9a00e7a6d1d9ba14c70d0c7a33fc (diff)
parent09f97172bb478a2c977d8b7b0958196e7e98c433 (diff)
merge
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r--indra/newview/lltoolpie.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index c5ef2a791b..9f5ec27d3f 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -305,6 +305,8 @@ BOOL LLToolPie::handleLeftClickPick()
}
}
return TRUE;
+ case CLICK_ACTION_DISABLED:
+ return TRUE;
default:
// nothing
break;
@@ -468,6 +470,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;
}
@@ -533,6 +537,8 @@ void LLToolPie::selectionPropertiesReceived()
case CLICK_ACTION_OPEN:
LLFloaterReg::showInstance("openobject");
break;
+ case CLICK_ACTION_DISABLED:
+ break;
default:
break;
}