SL-897 - notification wording fixes

2 files changed, 23 insertions, 3 deletions

diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 6c17fb9f8d..5e7aef69f1 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -365,6 +365,18 @@ void LLPanelVolume::getState( )
     if (root_volobjp && root_volobjp == volobjp)
     {
         enabled_animated_object_box = single_root_volume && root_volobjp && root_volobjp->canBeAnimatedObject() && editable; 
+#if 0
+        if (!enabled_animated_object_box)
+        {
+            LL_INFOS() << "not enabled: srv " << single_root_volume << " root_volobjp " << (bool) root_volobjp << LL_ENDL;
+            if (root_volobjp)
+            {
+                LL_INFOS() << " cba " << root_volobjp->canBeAnimatedObject()
+                           << " editable " << editable << " permModify() " << root_volobjp->permModify()
+                           << " ispermenf " << root_volobjp->isPermanentEnforced() << LL_ENDL;
+            }
+        }
+#endif
         if (enabled_animated_object_box && !is_animated_mesh && 
             root_volobjp->isAttachment() && !gAgentAvatarp->canAttachMoreAnimatedObjects())
         {
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 982d12d702..671a185fe2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10202,7 +10202,7 @@ Unable to create requested object. The region is full.
    name="CantCreateAnimatedObjectTooLarge"
    type="notify">
    <tag>fail</tag>
-Unable to create requested animated object because it exceeds the size limit.
+Unable to create requested animated object because it exceeds the rigged triangle limit.
   </notification>
 
   <notification
@@ -10346,7 +10346,7 @@ Operation would cause the number of attached animated objects to exceed the limi
    name="NoPermsLinkAnimatedObjectTooLarge"
    type="notify">
    <tag>fail</tag>
-Can't link these objects because the resulting animated object would exceed the size limit.
+Can't link these objects because the resulting animated object would exceed the rigged triangle limit.
   </notification>
 
   <notification
@@ -10354,7 +10354,15 @@ Can't link these objects because the resulting animated object would exceed the
    name="NoPermsSetFlagAnimatedObjectTooLarge"
    type="notify">
    <tag>fail</tag>
-Can't make this object into an animated object because it would exceed the size limit.
+Can't make this object into an animated object because it would exceed the rigged triangle limit.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantChangeAnimatedObjectStateInsufficientLand"
+   type="notify">
+   <tag>fail</tag>
+Can't change animated object state for this object because it would cause parcel limit to be exceeded.
   </notification>
 
   <notification