merge

1 files changed, 53 insertions, 14 deletions

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 484151a68b..70840670c2 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3587,6 +3587,19 @@ Do you really want to bake the current terrain, make it the center for terrain r
 
   <notification
    icon="alertmodal.tga"
+   name="ConfirmTextureHeights"
+   type="alertmodal">
+You're about to use low values greater than high ones for Elevation Ranges. Proceed?
+   <tag>confirm</tag>
+   <usetemplate
+    name="yesnocancelbuttons"
+    yestext="Ok"
+    notext="Cancel"
+    canceltext="Don't ask"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="MaxAllowedAgentOnRegion"
    type="alertmodal">
 You can only have [MAX_AGENTS] Allowed Residents.
@@ -3864,9 +3877,10 @@ We have downloaded an update to your [APP_NAME] installation.
   </notification>
   
   <notification
- icon="alertmodal.tga"
- name="RequiredUpdateDownloadedVerboseDialog"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="RequiredUpdateDownloadedVerboseDialog"
+   type="alertmodal"
+   force_urls_external="true">
 We have downloaded a required software update.
 Version [VERSION] [[INFO_URL] Information about this update]
 
@@ -3878,9 +3892,10 @@ We must restart [APP_NAME] to install the update.
   </notification>
   
   <notification
- icon="alertmodal.tga"
- name="RequiredUpdateDownloadedDialog"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="RequiredUpdateDownloadedDialog"
+   type="alertmodal"
+   force_urls_external="true">
 We must restart [APP_NAME] to install the update.
 [[INFO_URL] Information about this update]
     <tag>confirm</tag>
@@ -3920,9 +3935,10 @@ see [[INFO_URL] Information about this update]
   </notification>
   
   <notification
- icon="alertmodal.tga"
- name="OtherChannelRequiredUpdateDownloadedVerboseDialog"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="OtherChannelRequiredUpdateDownloadedVerboseDialog"
+   type="alertmodal"
+   force_urls_external="true">
 We have downloaded a required software update.
 Version [VERSION]
 This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
@@ -3936,9 +3952,10 @@ We must restart [APP_NAME] to install the update.
   </notification>
   
   <notification
- icon="alertmodal.tga"
- name="OtherChannelRequiredUpdateDownloadedDialog"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="OtherChannelRequiredUpdateDownloadedDialog"
+   type="alertmodal"
+   force_urls_external="true">
 We must restart [APP_NAME] to install the update.
 This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
 see [[INFO_URL] Information about this update]
@@ -5982,6 +5999,18 @@ Are you sure you want to permanently delete the contents of your Trash?
 
   <notification
    icon="alertmodal.tga"
+   name="TrashIsFull"
+   type="alertmodal">
+Your trash is overflowing. This may cause problems logging in.
+      <tag>confirm</tag>
+        <usetemplate
+         name="okcancelbuttons"
+         notext="I will empty trash later"
+         yestext="Empty trash now"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
    name="ConfirmClearBrowserCache"
    type="alertmodal">
 Are you sure you want to delete your travel, web, and search history?
@@ -7527,8 +7556,8 @@ Load web page [URL] ?
 
 [MESSAGE]
 
-From object: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, owner: [NAME]
-    <tag>confirm</tag>
+From object: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, owner: [NAME_SLURL]
+	<tag>confirm</tag>
     <form name="form">
       <button
        index="0"
@@ -8268,6 +8297,16 @@ Are you sure you want to close all IMs?
 		name="AttachmentSaved" type="notifytip">
 Attachment has been saved.
   </notification>
+  
+  <notification icon="notify.tga" persist="true"
+		name="AppearanceToXMLSaved" type="notify">
+Appearance has been saved to XML to [PATH]
+  </notification>
+  
+    <notification icon="notifytip.tga"
+		name="AppearanceToXMLFailed" type="notifytip">
+Failed to save appearance to XML.
+  </notification>
 
   <notification
     icon="alertmodal.tga"