SL-10268, SL-10323: Use _script_perm to display sit and change env questions. Exp log messages for environment changes."

3 files changed, 13 insertions, 10 deletions

diff --git a/indra/newview/llscriptruntimeperms.h b/indra/newview/llscriptruntimeperms.h
index 51f57afdc9..f692c0ad01 100644
--- a/indra/newview/llscriptruntimeperms.h
+++ b/indra/newview/llscriptruntimeperms.h
@@ -37,7 +37,7 @@ typedef struct _script_perm {
 	question(q), permbit(b), caution(c) {}
 } script_perm_t;
 
-const U32 NUM_SCRIPT_PERMISSIONS = 16;
+const U32 NUM_SCRIPT_PERMISSIONS = 18;
 const S32 SCRIPT_PERMISSION_DEBIT = 0;
 const S32 SCRIPT_PERMISSION_TRIGGER_ANIMATION = 3;
 const S32 SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS = 14;
@@ -58,7 +58,9 @@ static const boost::array<script_perm_t, NUM_SCRIPT_PERMISSIONS> SCRIPT_PERMISSI
 	_script_perm("JoinAnExperience",	(0x1 << 13), false),
 	_script_perm("SilentlyManageEstateAccess", (0x1 << 14), false),
 	_script_perm("OverrideYourAnimations", (0x1 << 15), false),
-	_script_perm("ScriptReturnObjects",	(0x1 << 16), false)
-}};
+	_script_perm("ScriptReturnObjects",	(0x1 << 16), false),
+    _script_perm("ForceSitAvatar",      (0x1 << 17), false),
+    _script_perm("ChangeEnvSettings",   (0x1 << 18), false)
+    } };
 
 #endif // LL_LLSCRIPTRUNTIME_PERMS_H
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index eaa67e6755..0597347ca8 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5763,19 +5763,16 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 				// check whether permission question should cause special caution dialog
 				caution |= (script_perm.caution);
 
-				if (("ScriptTakeMoney" == script_perm.question) && has_not_only_debit)
+				if ((("ScriptTakeMoney" == script_perm.question) && has_not_only_debit) ||
+                        (script_perm.question == "JoinAnExperience"))
 					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("ChangeEnvSettings") + "\n";
-                }
-
 				script_question += "    " + LLTrans::getString(script_perm.question) + "\n";
 			}
 		}
 	
+        script_question += "\n";
+
 		args["QUESTIONS"] = script_question;
 
 		if (known_questions != questions)
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 10e98719a4..1879ce6f32 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4219,6 +4219,8 @@ Try enclosing path to the editor with double quotes.
   <string name="ExperiencePermission10">control your camera</string>
   <string name="ExperiencePermission11">teleport you</string>
   <string name="ExperiencePermission12">automatically accept experience permissions</string>
+  <string name="ExperiencePermission16">force your avatar to sit</string>
+  <string name="ExperiencePermission17">change your environment settings</string>
   <string name="ExperiencePermissionShortUnknown">perform an unknown operation: [Permission]</string>
   <string name="ExperiencePermissionShort1">Take Controls</string>
   <string name="ExperiencePermissionShort3">Trigger Animations</string>
@@ -4227,6 +4229,8 @@ Try enclosing path to the editor with double quotes.
   <string name="ExperiencePermissionShort10">Control Camera</string>
   <string name="ExperiencePermissionShort11">Teleport</string>
   <string name="ExperiencePermissionShort12">Permission</string>
+  <string name="ExperiencePermissionShort16">Sit</string>
+  <string name="ExperiencePermissionShort17">Environment</string>
 
   <!-- Conversation log messages -->
   <string name="logging_calls_disabled_log_empty">