Merge branch 'main' into DRTVWR-580-maint-T

9 files changed, 96 insertions, 19 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_display_name.xml b/indra/newview/skins/default/xui/en/floater_display_name.xml
index 3c8f415860..f3431da858 100644
--- a/indra/newview/skins/default/xui/en/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en/floater_display_name.xml
@@ -56,7 +56,7 @@
       max_length_chars="31"
       height="20"
       top_pad="5"
-      left="50" />
+      left_delta="0" />
 	<text
        top_pad="15"
        left="25"
@@ -72,23 +72,33 @@
       max_length_chars="31"
       height="20"
       top_pad="5"
-      left="50" />
+      left_delta="0" />
+    <button
+     label="Reset"
+     layout="topleft"
+     font="SansSerif"
+     width="120"
+     height="23"
+     top_pad="40"
+     left_delta="0"
+     name="reset_btn"
+     tool_tip="Use Username as a Display Name" />
     <button
      height="23"
      label="Save"
      layout="topleft"
      font="SansSerif"
-     left="35"
+     left_pad="35"
      name="save_btn"
      tool_tip="Save your new Display Name" 
-     top_pad="40"
+     top_delta="0"
      width="120" />
     <button
      height="23"
      label="Cancel"
      font="SansSerif"
      layout="topleft"
-     left_pad="125"
+     left_pad="5"
      name="cancel_btn"
      width="120" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
index 45e16c59ae..850e1be372 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
@@ -323,7 +323,6 @@
         follows="left|top"
         decimal_digits="0"
         increment="1"
-        control_name="Edit Cost"
         name="Edit Cost"
         label="Price:"
         label_width="100"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index ade79b8884..d9b0ac0060 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1140,7 +1140,6 @@ even though the user gets a free copy.
       decimal_digits="0"
       increment="1"
       left_pad="0"
-      control_name="Edit Cost"
       name="Edit Cost"
       label="L$"
       label_width="15"
diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml
index 7ea87ee05c..b9750284cd 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_view.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml
@@ -90,7 +90,7 @@
          parameter="conversation_log" />
     </menu_item_check>
     <menu_item_separator layout="topleft" />
-    <menu_item_check name="Translate_chat" label="Translate Nearby chat">
+    <menu_item_check name="Translate_chat" label="Translate chat">
         <menu_item_check.on_click
          function="IMFloaterContainer.Action" 
          parameter="Translating.Toggle" />
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index 2316beeb36..4c566dc60a 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -92,10 +92,7 @@
    label="Reset"
    left_delta="233" 
    name="current_url_reset_btn" 
-   width="110" > 
-   <button.commit_callback
-	     function="Media.ResetCurrentUrl"/>
-  </button>
+   width="110"/>
   <check_box 
    bottom_delta="-25" 
    enabled="true" 
diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml
index 9b9c870c49..33e99a46ae 100644
--- a/indra/newview/skins/default/xui/en/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml
@@ -82,7 +82,7 @@
     <view_border
      bevel_style="none"
      follows="top|left"
-     height="185"
+     height="205"
      layout="topleft"
      left="10"
      top_pad="5"
@@ -126,6 +126,16 @@
      top_pad="2"
      width="278" />
     <check_box
+     follows="top|left"
+     height="18"
+     label="Must not be a scripted agent"
+     layout="topleft"
+     left_delta="0"
+     name="limit_bots"
+     tool_tip="Residents must not be a scripted agents (bots) to access this estate.  See the [SUPPORT_SITE] for more information."
+     top_pad="2"
+     width="278" />
+    <check_box
      height="18"
      label="Parcel owners can be more restrictive"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 9a68479d05..35d14251c7 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -450,7 +450,6 @@
         follows="left|top"
         decimal_digits="0"
         increment="1"
-        control_name="Edit Cost"
         name="Edit Cost"
         label="Price: L$"
         label_width="75"
@@ -461,8 +460,72 @@
         max_val="999999999"
         top_pad="10"
         tool_tip="Object cost." />
-    </panel>
-
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="10"
+        name="BaseMaskDebug"
+        text_color="White"
+        top_pad="30"
+        width="130">
+        B:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="OwnerMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="270">
+        O:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="GroupMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="210">
+        G:
+      </text>
+      <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left_delta="60"
+        name="EveryoneMaskDebug"
+        text_color="White"
+        top_delta="0"
+        width="150">
+        E:
+      </text>
+      <text
+       type="string"
+       length="1"
+       follows="left|top"
+       height="10"
+       layout="topleft"
+       left_delta="60"
+       name="NextMaskDebug"
+       text_color="White"
+       top_delta="0"
+       width="90">
+        N:
+      </text>
+    </panel>   
   </scroll_container>
   <panel
     height="30"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 1c9d750aa6..0b32215964 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -454,7 +454,6 @@
         increment="1"
         top_pad="10"
         left="120"
-        control_name="Edit Cost"
         name="Edit Cost"
         label="Price: L$"
         label_width="73"				
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 42a10e8c56..2fd2028c6b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -126,8 +126,8 @@ http://secondlife.com/download
 
 For more information, see our FAQ below:
 http://secondlife.com/viewer-access-faq</string>
-	<string name="LoginFailed">Grid emergency login failure.
-If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailed">"Login process did not complete due to system issues. Try again in a few minutes.
+If you feel this is an error, contact Support at https://support.secondlife.com"</string>
 	<string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string>
 	<string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string>
 	<string name="LoginFailedAlreadyLoggedIn">This agent is already logged in.