Handle new privileged land permission. Allow caution dialog to contain multiple messages.

6 files changed, 29 insertions, 17 deletions

diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index a819b30e30..d3ec79cb0d 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -34,7 +34,7 @@
 #include "llpanel.h"
 #include "llcombobox.h"
 
-const S32 NOTIFICATION_PANEL_HEADER_HEIGHT = 20;
+const S32 NOTIFICATION_PANEL_HEADER_HEIGHT = 40;
 const S32 HEADER_PADDING = 38;
 
 class LLNotificationChannelPanel : public LLLayoutPanel
diff --git a/indra/newview/llscriptruntimeperms.h b/indra/newview/llscriptruntimeperms.h
index 300304c21b..6350b61d08 100644
--- a/indra/newview/llscriptruntimeperms.h
+++ b/indra/newview/llscriptruntimeperms.h
@@ -24,10 +24,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef LL_LLSCRIPTRUNTIME_PERMS_H
-#define LL_LLSCRIPTRUNTIME_PERMS_H
-
-#include <boost/array.hpp>
+#pragma once
 
 typedef struct _script_perm {
     std::string question;
@@ -37,12 +34,12 @@ typedef struct _script_perm {
     question(q), permbit(b), caution(c) {}
 } script_perm_t;
 
-const U32 NUM_SCRIPT_PERMISSIONS = 18;
+const U32 NUM_SCRIPT_PERMISSIONS = 19;
 const S32 SCRIPT_PERMISSION_DEBIT = 0;
 const S32 SCRIPT_PERMISSION_TRIGGER_ANIMATION = 3;
 const S32 SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS = 14;
 
-static const boost::array<script_perm_t, NUM_SCRIPT_PERMISSIONS> SCRIPT_PERMISSIONS = {{
+static const std::array<script_perm_t, NUM_SCRIPT_PERMISSIONS> SCRIPT_PERMISSIONS = {{
     _script_perm("ScriptTakeMoney",     (0x1 << 1),  true),
     _script_perm("ActOnControlInputs",  (0x1 << 2),  false),
     _script_perm("RemapControlInputs",  (0x1 << 3),  false),
@@ -60,7 +57,7 @@ static const boost::array<script_perm_t, NUM_SCRIPT_PERMISSIONS> SCRIPT_PERMISSI
     _script_perm("OverrideYourAnimations", (0x1 << 15), false),
     _script_perm("ScriptReturnObjects", (0x1 << 16), false),
     _script_perm("ForceSitAvatar",      (0x1 << 17), false),
-    _script_perm("ChangeEnvSettings",   (0x1 << 18), false)
+    _script_perm("ChangeEnvSettings",   (0x1 << 18), false),
+    _script_perm("PrivilegedLandAccess",(0x1 << 19), true)
     } };
 
-#endif // LL_LLSCRIPTRUNTIME_PERMS_H
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 36e8e27800..731e2b68bb 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5749,7 +5749,9 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
         args["NAME"] = clean_owner_name;
         S32 known_questions = 0;
         bool has_not_only_debit = questions ^ SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_DEBIT].permbit;
+        bool caution_enabled    = gSavedSettings.getBOOL("PermissionsCautionEnabled");
         // check the received permission flags against each permission
+        std::string warning_msg;
         for (const script_perm_t& script_perm : SCRIPT_PERMISSIONS)
         {
             if (questions & script_perm.permbit)
@@ -5759,8 +5761,11 @@ 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 (caution_enabled && script_perm.caution)
+                {
+                    warning_msg += "\n" + LLTrans::getString(script_perm.question + "Caution") + "\n";
                     continue;
+                }
 
                 if (LLTrans::getString(script_perm.question).empty())
                 {
@@ -5771,6 +5776,12 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
             }
         }
 
+        if (!warning_msg.empty())
+        {
+            LLStringUtil::format(warning_msg, args);
+            args["WARNINGS"] = warning_msg;
+        }
+
         args["QUESTIONS"] = script_question;
 
         if (known_questions != questions)
@@ -5795,12 +5806,12 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
             // check whether cautions are even enabled or not
             const char* notification = "ScriptQuestion";
 
-            if(caution && gSavedSettings.getBOOL("PermissionsCautionEnabled"))
+            if (caution && caution_enabled)
             {
                 args["FOOTERTEXT"] = (count > 1) ? LLTrans::getString("AdditionalPermissionsRequestHeader") + "\n\n" + script_question : "";
                 notification = "ScriptQuestionCaution";
             }
-            else if(experienceid.notNull())
+            else if (experienceid.notNull())
             {
                 payload["experience"]=experienceid;
                 LLExperienceCache::instance().get(experienceid, boost::bind(process_script_experience_details, _1, args, payload));
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dbd513afe8..5088426502 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8585,7 +8585,8 @@ Scripts associated with this experience will be able to do the following on regi
    priority="critical"
    persist="true"
    type="notify">
-Warning: The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
+Warning: 
+[WARNINGS]
   
 Do not allow access if you do not fully understand why it wants access to your account.
 
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index bfe738f472..eaf638d35f 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -49,7 +49,7 @@
       embedded_items="false"
       enabled="false"
       follows="left|right|top|bottom"
-      height="85" 
+      height="85"
       layout="topleft"
       left="10"
       mouse_opaque="false"
@@ -67,16 +67,16 @@
   <panel
     background_visible="false"
     follows="left|right|bottom"
-    height="30" 
+    height="30"
     width="290"
     label="control_panel"
     layout="topleft"
     left="10"
     name="control_panel"
     top_pad="5">
-    <!-- 
+    <!--
     Notes:
-    This panel holds buttons of notification. Change of its size can affect the layout of buttons. 
+    This panel holds buttons of notification. Change of its size can affect the layout of buttons.
      -->
   </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8e0eea97d1..bcda160f21 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -518,6 +518,8 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
 	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
 	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
+    <string name="ScriptTakeMoneyCaution">The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.</string>
+    <string name="PrivilegedLandAccessCaution">The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants privileged access to your land. If you allow access it may sell your land with no additional warnings.</string>
 	<string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
 	<string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string>
 	<string name="ActOnControlInputs">Act on your control inputs</string>
@@ -535,6 +537,7 @@ http://secondlife.com/support for help fixing this problem.
 	<string name="ChangeYourDefaultAnimations">Change your default animations</string>
 	<string name="ForceSitAvatar">Force your avatar to sit</string>
 	<string name="ChangeEnvSettings">Change your environment settings</string>
+    <string name="PrivilegedLandAccess">Sell land on your behalf.</string>
 	
 	<string name="NotConnected">Not Connected</string>
 	<string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name -->