Merged in lindenlab/viewer-release

1 files changed, 33 insertions, 56 deletions

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f9059627db..7eaeb6bd07 100755..100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -554,22 +554,6 @@ This listing could not be updated.
 
   <notification
    icon="alertmodal.tga"
-   name="CompileQueueSaveText"
-   type="alertmodal">
-There was a problem uploading the text for a script due to the following reason: [REASON]. Please try again later.
-    <tag>fail</tag>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CompileQueueSaveBytecode"
-   type="alertmodal">
-There was a problem uploading the compiled script due to the following reason: [REASON]. Please try again later.
-    <tag>fail</tag>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
    name="WriteAnimationFail"
    type="alertmodal">
 There was a problem writing animation data.  Please try again later.
@@ -1568,14 +1552,6 @@ Would you like to load the server&apos;s last saved version?
 
   <notification
    icon="alertmodal.tga"
-   name="SaveScriptFailReason"
-   type="alertmodal">
-There was a problem saving a script due to the following reason: [REASON].  Please try re-saving the script later.
-<tag>fail</tag>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
    name="SaveScriptFailObjectNotFound"
    type="alertmodal">
 Could not save the script because the object it is in could not be found.
@@ -1585,14 +1561,6 @@ The object may be out of range or may have been deleted.
 
   <notification
    icon="alertmodal.tga"
-   name="SaveBytecodeFailReason"
-   type="alertmodal">
-There was a problem saving a compiled script due to the following reason: [REASON].  Please try re-saving the script later.
-<tag>fail</tag>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
    name="StartRegionEmpty"
    type="alertmodal">
 Your Start Region is not defined.
@@ -2787,8 +2755,9 @@ This is usually a temporary failure. Please customize and save the wearable agai
    icon="alertmodal.tga"
    name="YouHaveBeenLoggedOut"
    type="alertmodal">
-Darn. You have been logged out of [SECOND_LIFE]
-            [MESSAGE]
+Darn. You have been logged out of [SECOND_LIFE].
+
+[MESSAGE]
     <usetemplate
      name="okcancelbuttons"
      notext="Quit"
@@ -3357,6 +3326,32 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
   </notification>
 
   <notification
+   icon = "notifytip.tga"
+   name = "AgentComplexityWithVisibility"
+   type = "notifytip"
+   log_to_chat = "false">
+   <unique combine = "cancel_old">
+     <context>AgentComplexityNotice</context>
+   </unique>
+Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+   <usetemplate
+    ignoretext="Warn me if my avatar complexity may be too high"
+    name="notifyignore"/>
+  </notification>
+
+  <notification
+   icon = "notifytip.tga"
+   name = "AgentComplexity"
+   type = "notifytip"
+   log_to_chat = "false">
+   <unique combine = "cancel_old">
+     <context>AgentComplexityNotice</context>
+   </unique>
+Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY].
+  </notification>
+
+  <notification
    icon="alertmodal.tga"
    name="FirstRun"
    type="alertmodal">
@@ -4194,28 +4189,6 @@ Leave Group?
   </notification>
 
   <notification
-   icon="aler.tga"
-   name="GroupDepartError"
-   type="alert">
-Unable to leave group: [reason].
-      <tag>reason</tag>
-      <usetemplate
-       name="okbutton"
-       yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="GroupDepart"
-   type="alert">
-You have left the group [group_name].
-      <tag>group_name</tag>
-      <usetemplate
-       name="okbutton"
-       yestext="OK"/>
-  </notification>
-
-  <notification
    icon="alert.tga"
    name="ConfirmKick"
    type="alert">
@@ -8341,6 +8314,10 @@ Appearance has been saved to XML to [PATH]
     <notification icon="notifytip.tga"
 		name="AppearanceToXMLFailed" type="notifytip">
 Failed to save appearance to XML.
+    icon="notifytip.tga"
+	name="PresetNotDeleted"
+    type="notifytip">
+Error deleting preset [NAME].
   </notification>
 
   <notification