summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-10-07 21:11:47 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-10-07 21:11:47 +0300
commitd66cd019b30ec6ab519fa0ea0c76c1beb99be74c (patch)
tree86d78b577080eb4dd29575f487776bde13914de7 /indra/newview/llviewermessage.cpp
parent752613c433751ca90e13a1d3c77e8df55308e246 (diff)
parent5dd97bc2bd4924b0342068e697b5d45165225b76 (diff)
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 1a220a07b9..f27b77e2f1 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6611,6 +6611,11 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
if (("ScriptTakeMoney" == script_perm.question) && has_not_only_debit)
continue;
+ if (script_perm.question == "JoinAnExperience")
+ { // Some experience only permissions do not have an explicit permission bit. Add them here.
+ script_question += " " + LLTrans::getString("ForceSitAvatar") + "\n";
+ }
+
script_question += " " + LLTrans::getString(script_perm.question) + "\n";
}
}