diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
commit | 620817c1c3368d73f1b47b1593a0bcbcf567e297 (patch) | |
tree | e37b76dc8d154ab661ab23e6be2b6b098f97e4b2 /indra/llui/llui.h | |
parent | 329608d24668b044e16b54ff7a7d0ac592b2b88d (diff) | |
parent | 8897e7ca24533e0093825346391f5fa9a37f2427 (diff) |
Merge. Refresh from viewer-drano-http-4 after release of 3.7.16.
Diffstat (limited to 'indra/llui/llui.h')
-rwxr-xr-x | indra/llui/llui.h | 1 |
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. |