#4628 New land access permission

6 files changed, 77 insertions, 26 deletions

diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index d3ec79cb0d..a819b30e30 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 = 40;
+const S32 NOTIFICATION_PANEL_HEADER_HEIGHT = 20;
 const S32 HEADER_PADDING = 38;
 
 class LLNotificationChannelPanel : public LLLayoutPanel
diff --git a/indra/newview/lltoastscriptquestion.cpp b/indra/newview/lltoastscriptquestion.cpp
index 25dc0982b8..5d99efe6a4 100644
--- a/indra/newview/lltoastscriptquestion.cpp
+++ b/indra/newview/lltoastscriptquestion.cpp
@@ -48,7 +48,12 @@ bool LLToastScriptQuestion::postBuild()
     LLTextBox* mFooter = getChild<LLTextBox>("bottom_info_message");
 
     mMessage->setValue(mNotification->getMessage());
-    mFooter->setValue(mNotification->getFooter());
+    std::string footer = mNotification->getFooter();
+    mFooter->setValue(footer);
+    if (footer.empty())
+    {
+        mFooter->setVisible(false);
+    }
 
     snapToMessageHeight();
 
@@ -78,21 +83,69 @@ void LLToastScriptQuestion::snapToMessageHeight()
 
     if (mMessage->getVisible() && mFooter->getVisible())
     {
-        S32 heightDelta = 0;
-        S32 maxTextHeight = (mMessage->getFont()->getLineHeight() * MAX_LINES_COUNT)
+        S32 height_delta = 0;
+        S32 max_text_height = (mMessage->getFont()->getLineHeight() * MAX_LINES_COUNT)
                           + (mFooter->getFont()->getLineHeight() * MAX_LINES_COUNT);
 
-        LLRect messageRect = mMessage->getRect();
-        LLRect footerRect  = mFooter->getRect();
+        LLRect message_rect = mMessage->getRect();
+
+        S32 old_message_height = message_rect.getHeight();
+        S32 new_message_height = mMessage->getTextBoundingRect().getHeight();
+        S32 new_footer_height = mFooter->getTextBoundingRect().getHeight();
+
+        constexpr S32 FOOTER_PADDING = 8; // new height should include padding for newly added footer
+        S32 required_text_height = new_message_height + new_footer_height + FOOTER_PADDING;
+        S32 new_text_height = llmin(required_text_height, max_text_height);
+
+        // Footer was invisibe, so use old_message_height for old height
+        height_delta = new_text_height - old_message_height;
+
+        reshape( getRect().getWidth(), llmax(getRect().getHeight() + height_delta, MIN_PANEL_HEIGHT));
+
+        // Floater was resized, now resize and shift children
+        // Message follows top, so it's top is in a correct position, but needs to be resized down
+        S32 message_delta = new_message_height - old_message_height;
+        message_rect = mMessage->getRect(); // refresh since it might have changed after reshape
+        message_rect.mBottom = message_rect.mBottom - message_delta;
+        mMessage->setRect(message_rect);
+        mMessage->needsReflow();
+        // Button panel should stay the same size, just translate it
+        LLPanel* panel = getChild<LLPanel>("buttons_panel");
+        panel->translate(0, -message_delta);
+        // Footer should be both moved and resized
+        LLRect footer_rect = mFooter->getRect();
+        footer_rect.mTop = footer_rect.mTop - message_delta;
+        footer_rect.mBottom = footer_rect.mTop - new_footer_height;
+        mFooter->setRect(footer_rect);
+        mFooter->needsReflow();
+    }
+    else if (mMessage->getVisible())
+    {
+        S32 height_delta = 0;
+        S32 max_text_height = (mMessage->getFont()->getLineHeight() * MAX_LINES_COUNT);
+
+        LLRect message_rect = mMessage->getRect();
+
+        S32 old_message_height = message_rect.getHeight();
+        S32 new_message_height = mMessage->getTextBoundingRect().getHeight();
 
-        S32 oldTextHeight = messageRect.getHeight() + footerRect.getHeight();
+        S32 new_text_height = llmin(new_message_height, max_text_height);
 
-        S32 requiredTextHeight = mMessage->getTextBoundingRect().getHeight() + mFooter->getTextBoundingRect().getHeight();
-        S32 newTextHeight = llmin(requiredTextHeight, maxTextHeight);
+        // Footer was invisibe, so use old_message_height for old height
+        height_delta = new_text_height - old_message_height;
 
-        heightDelta = newTextHeight - oldTextHeight - heightDelta;
+        reshape(getRect().getWidth(), llmax(getRect().getHeight() + height_delta, MIN_PANEL_HEIGHT));
 
-        reshape( getRect().getWidth(), llmax(getRect().getHeight() + heightDelta, MIN_PANEL_HEIGHT));
+        // Floater was resized, now resize and shift children
+        // Message follows top, so it's top is in a correct position, but needs to be resized down
+        S32 message_delta = new_message_height - old_message_height;
+        message_rect = mMessage->getRect(); // refresh since it might have changed after reshape
+        message_rect.mBottom = message_rect.mBottom - message_delta;
+        mMessage->setRect(message_rect);
+        mMessage->needsReflow();
+        // Button panel should stay the same size, just translate it
+        LLPanel* panel = getChild<LLPanel>("buttons_panel");
+        panel->translate(0, -message_delta);
     }
 }
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 731e2b68bb..6f2b00a862 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5756,11 +5756,11 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
         {
             if (questions & script_perm.permbit)
             {
-                count++;
                 known_questions |= script_perm.permbit;
                 // check whether permission question should cause special caution dialog
                 caution |= (script_perm.caution);
 
+                // Caustions go into top part of the dialog, questions go into the footer
                 if (caution_enabled && script_perm.caution)
                 {
                     warning_msg += "\n" + LLTrans::getString(script_perm.question + "Caution") + "\n";
@@ -5772,7 +5772,8 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
                     continue;
                 }
 
-                script_question += "    " + LLTrans::getString(script_perm.question) + "\n";
+                count++;
+                script_question += "\n    " + LLTrans::getString(script_perm.question);
             }
         }
 
@@ -5806,9 +5807,9 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
             // check whether cautions are even enabled or not
             const char* notification = "ScriptQuestion";
 
-            if (caution && caution_enabled)
+            if(caution && caution_enabled)
             {
-                args["FOOTERTEXT"] = (count > 1) ? LLTrans::getString("AdditionalPermissionsRequestHeader") + "\n\n" + script_question : "";
+                args["FOOTERTEXT"] = (count > 0) ? LLTrans::getString("AdditionalPermissionsRequestHeader") + "\n" + script_question : "";
                 notification = "ScriptQuestionCaution";
             }
             else if (experienceid.notNull())
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5088426502..46c1d3abe9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8585,11 +8585,10 @@ Scripts associated with this experience will be able to do the following on regi
    priority="critical"
    persist="true"
    type="notify">
-Warning: 
+Warning:
 [WARNINGS]
-  
-Do not allow access if you do not fully understand why it wants access to your account.
 
+Do not allow access if you do not fully understand why it wants access to your account.
   <tag>confirm</tag>
     <form name="form">
       <button
@@ -8602,9 +8601,7 @@ Do not allow access if you do not fully understand why it wants access to your a
        name="Deny"
        text="Deny"/>
     </form>
-    <footer>
-[FOOTERTEXT]
-    </footer>
+    <footer>[FOOTERTEXT]</footer>
   </notification>
 
 	<notification
diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
index 1b1e31165a..9045e6a8ae 100644
--- a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
@@ -6,7 +6,7 @@
   bg_alpha_color="PanelNotificationBackground"
   bg_opaque_color="PanelNotificationBackground"
   chrome="true"
-  height="270"
+  height="220"
   label="script_question_panel"
   layout="topleft"
   left="0"
@@ -39,9 +39,9 @@
       width="285">
     </panel>
     <text
-      follows="all"
+      follows="left|right|top"
       font="SansSerifBold"
-      height="55"
+      height="15"
       layout="topleft"
       mouse_opaque="false"
       name="bottom_info_message"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bcda160f21..25b459f01b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -518,8 +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="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>