Merge branch 'ubitworkmaster'

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 5197f58..0c51f7f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1023,6 +1023,10 @@ namespace OpenSim.Region.Framework.Scenes
             item.BasePermissions = baseMask;
             item.CreationDate = creationDate;
 
+            // special AnimationSet case
+            if (item.InvType == (int)CustomInventoryType.AnimationSet)
+                AnimationSet.enforceItemPermitions(item,true);
+
             if (AddInventoryItem(item))
             {
                 remoteClient.SendInventoryItemCreateUpdate(item, transationID, callbackID);
@@ -1063,10 +1067,6 @@ namespace OpenSim.Region.Framework.Scenes
             if (!Permissions.CanCreateUserInventory(invType, remoteClient.AgentId))
                 return;
 
-            if (type != (sbyte)AssetType.Link || type != (sbyte)AssetType.LinkFolder)
-                return;
-
-
             ScenePresence presence;
             if (TryGetScenePresence(remoteClient.AgentId, out presence))
             {