* Applying Mantis #1020 (Animations) - Thanks Melanie.

2 files changed, 34 insertions, 12 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index b8264ba..53c75b0 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Framework
 
     public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
 
-    public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID, int seq);
+    public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID);
 
     public delegate void StopAnim(IClientAPI remoteClient, LLUUID animID);
 
@@ -572,6 +572,8 @@ namespace OpenSim.Framework
         string FirstName { get; }
 
         string LastName { get; }
+                
+                int NextAnimationSequenceNumber { get; }
 
         /// <summary>
         /// Returns the full name of the agent/avatar represented by this client
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 1cf2e58..5453eb3 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -143,16 +143,26 @@ namespace OpenSim.Framework
         {
             "texture",
             "sound",
+            "calling_card",
+            "landmark",
             String.Empty,
             String.Empty,
+            "object",
+            "notecard",
             String.Empty,
             String.Empty,
+            "lsl_text",
             String.Empty,
             String.Empty,
+                        "bodypart",
             String.Empty,
+            "snapshot",
             String.Empty,
-            "lsl_text",
-            String.Empty
+            String.Empty,
+            "wearable",
+                        "animation",
+                        "gesture"
+
         };
         
         /// <summary>
@@ -162,16 +172,26 @@ namespace OpenSim.Framework
         {
             "texture",
             "sound",
-            String.Empty,
-            String.Empty,
-            String.Empty,
-            String.Empty,
-            String.Empty,
-            String.Empty,
-            String.Empty,
-            String.Empty,
+            "callcard",
+            "landmark",
+            "clothing", // Deprecated
+            "clothing",
+            "object",
+            "notecard",
+            "category",
+            "root",
             "lsltext",
-            String.Empty
+            "lslbyte",
+            "txtr_tga",
+                        "bodypart",
+            "trash",
+            "snapshot",
+            "lstndfnd",
+            "snd_wav",
+            "img_tga",
+            "jpeg",
+                        "animatn",
+                        "gesture"
         };              
 
         public LLUUID ItemID = LLUUID.Zero;