summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2016-10-03 10:37:33 -0700
committerRider Linden <rider@lindenlab.com>2016-10-03 10:37:33 -0700
commit5ff1be79a352390ecde5bdfb9b59e609d3ced29e (patch)
treebf9f860bff70b53a9c5afe1805e68e1927ae264a /indra/newview/llviewermessage.cpp
parent89844b345e8bfc69c5f0bd49bdc402d0b1c24e3b (diff)
parentb2eded73b9bf55e2253a9c39113ff0598c2c18cb (diff)
Merge
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 3925154c0f..f472db080f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6605,6 +6605,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";
}
}