From cb0031880d72cde1d129175276391e91ddadae66 Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Tue, 20 Oct 2015 09:22:47 -0700
Subject: SL-113: viewer message from simulator on illegal attachment point

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f847c73287..30e7caad76 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10258,6 +10258,14 @@ Not enough script resources available to attach object!
     Cannot attach object because it is already being removed.
   </notification>
 
+  <notification
+  icon="alertmodal.tga"
+  name="IllegalAttachment"
+  type="notify">
+   <tag>fail</tag>
+   The attachment point specified is not valid and the item has been attached to the default location: chest.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CantDropItemTrialUser"
-- 
cgit v1.2.3


From d365aa10f16c022970cefbfac8651fe01b5a9de8 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 21 Oct 2015 16:47:03 -0400
Subject: SL-234 WIP - moved LLSkinningUtil funcs to separate class/files.
 Remap weights where needed. Warn that related debug settings require restart
 to take effect.

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 70ba4d5077..ab027ac600 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1422,6 +1422,13 @@ Note: This will clear the cache.
 Port settings take effect after you restart [APP_NAME].
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="ChangeDeferredDebugSetting"
+   type="alertmodal">
+This debug setting change will take effect after you restart [APP_NAME].
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="ChangeSkin"
-- 
cgit v1.2.3


From 3b702b6616854d19c9432e568197dc60fc772d9c Mon Sep 17 00:00:00 2001
From: Glenn Glazer <coyot@lindenlab.com>
Date: Mon, 26 Oct 2015 11:05:58 -0700
Subject: SL-113: use product approved message string

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/notifications.xml')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 30e7caad76..bc051ca1ad 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10263,7 +10263,7 @@ Not enough script resources available to attach object!
   name="IllegalAttachment"
   type="notify">
    <tag>fail</tag>
-   The attachment point specified is not valid and the item has been attached to the default location: chest.
+   The attachment has requested a nonexistent point on the avatar. It has been attached to the chest instead.
   </notification>
 
   <notification
-- 
cgit v1.2.3