summaryrefslogtreecommitdiff
path: root/indra/llui/llui.h
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-09-22 17:11:17 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-09-22 17:11:17 -0400
commit8897e7ca24533e0093825346391f5fa9a37f2427 (patch)
tree781b08a7a90e53124d4f11b507be4d726544f0f0 /indra/llui/llui.h
parent79ab7c20703c092a4416a4f9a885e0246fc17ee0 (diff)
parent499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff)
Merge. Refresh from viewer-release after 3.7.16 release.
Diffstat (limited to 'indra/llui/llui.h')
-rwxr-xr-xindra/llui/llui.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index b162f25887..c727f75c4f 100755
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -86,6 +86,7 @@ enum EAcceptance
{
ACCEPT_POSTPONED, // we are asynchronously determining acceptance
ACCEPT_NO, // Uninformative, general purpose denial.
+ ACCEPT_NO_CUSTOM, // Denial with custom message.
ACCEPT_NO_LOCKED, // Operation would be valid, but permissions are set to disallow it.
ACCEPT_YES_COPY_SINGLE, // We'll take a copy of a single item
ACCEPT_YES_SINGLE, // Accepted. OK to drag and drop single item here.