7 files changed, 100 insertions, 15 deletions

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 6472f31..c0168e2 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -215,6 +215,7 @@ namespace OpenSim.Framework
         }
     }
 
+
     /// <summary>
     /// Serializable Agent Circuit Data
     /// </summary>
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index aacd127..825ab81 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -226,6 +226,46 @@ namespace OpenSim.Framework
         }
     }
 
+    public class AttachmentData
+    {
+        public int AttachPoint;
+        public UUID ItemID;
+        public UUID AssetID;
+
+        public AttachmentData(int point, UUID item, UUID asset)
+        {
+            AttachPoint = point;
+            ItemID = item;
+            AssetID = asset;
+        }
+
+        public AttachmentData(OSDMap args)
+        {
+            UnpackUpdateMessage(args);
+        }
+
+        public OSDMap PackUpdateMessage()
+        {
+            OSDMap attachdata = new OSDMap();
+            attachdata["point"] = OSD.FromInteger(AttachPoint);
+            attachdata["item"] = OSD.FromUUID(ItemID);
+            attachdata["asset"] = OSD.FromUUID(AssetID);
+
+            return attachdata;
+        }
+
+
+        public void UnpackUpdateMessage(OSDMap args)
+        {
+            if (args["point"] != null)
+                AttachPoint = args["point"].AsInteger();
+            if (args["item"] != null)
+                ItemID = args["item"].AsUUID();
+            if (args["asset"] != null)
+                AssetID = args["asset"].AsUUID();
+        }
+    }
+
     public class AgentData : IAgentData
     {
         private UUID m_id;
@@ -272,6 +312,7 @@ namespace OpenSim.Framework
         public byte[] AgentTextures;
         public byte[] VisualParams;
         public UUID[] Wearables;
+        public AttachmentData[] Attachments;
 
         public string CallbackURI;
 
@@ -352,6 +393,13 @@ namespace OpenSim.Framework
                 args["wearables"] = wears;
             }
 
+            if ((Attachments != null) && (Attachments.Length > 0))
+            {
+                OSDArray attachs = new OSDArray(Attachments.Length);
+                foreach (AttachmentData att in Attachments)
+                    attachs.Add(att.PackUpdateMessage());
+                args["attachments"] = attachs;
+            }
 
             if ((CallbackURI != null) && (!CallbackURI.Equals("")))
                 args["callback_uri"] = OSD.FromString(CallbackURI);
@@ -492,7 +540,21 @@ namespace OpenSim.Framework
                 foreach (OSD o in wears)
                     Wearables[i++] = o.AsUUID();
             }
-            
+
+            if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array)
+            {
+                OSDArray attachs = (OSDArray)(args["attachments"]);
+                Attachments = new AttachmentData[attachs.Count];
+                int i = 0;
+                foreach (OSD o in attachs)
+                {
+                    if (o.Type == OSDType.Map)
+                    {
+                        Attachments[i++] = new AttachmentData((OSDMap)o);
+                    }
+                }
+            }
+
             if (args["callback_uri"] != null)
                 CallbackURI = args["callback_uri"].AsString();
         }
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 8ee1b1a..ca641d0 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -747,7 +747,7 @@ namespace OpenSim.Framework.Communications.Cache
 
                 InventoryItemBase itemInfo = null;
 
-                itemInfo = m_InventoryService.QueryItem(item);
+                itemInfo = m_InventoryService.GetItem(item);
 
                 if (itemInfo != null)
                 {
@@ -784,7 +784,7 @@ namespace OpenSim.Framework.Communications.Cache
 
                 InventoryFolderBase folderInfo = null;
 
-                folderInfo = m_InventoryService.QueryFolder(folder);
+                folderInfo = m_InventoryService.GetFolder(folder);
 
                 if (folderInfo != null)
                 {
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 9709975..8a8108b 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -205,7 +205,8 @@ namespace OpenSim.Framework.Communications.Services
                     // Otherwise...
                     // Create a new agent session
 
-                    m_userManager.ResetAttachments(userProfile.ID);
+                    // XXYY we don't need this
+                    //m_userManager.ResetAttachments(userProfile.ID);
 
                     CreateAgent(userProfile, request);
 
@@ -462,7 +463,8 @@ namespace OpenSim.Framework.Communications.Services
                     // Otherwise...
                     // Create a new agent session
 
-                    m_userManager.ResetAttachments(userProfile.ID);
+                    // XXYY We don't need this
+                    //m_userManager.ResetAttachments(userProfile.ID);
 
                     CreateAgent(userProfile, request);
 
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index fe88cf5..670c9ff 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -186,14 +186,14 @@ namespace OpenSim.Framework.Communications.Tests
 
             Assert.That(
                 userInfo.CreateFolder("testFolder1", folderId, (ushort)AssetType.Animation, missingFolderId), Is.False);
-            Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Null);
+            Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null);
             Assert.That(userInfo.RootFolder.ContainsChildFolder(missingFolderId), Is.False);
             Assert.That(userInfo.RootFolder.FindFolder(folderId), Is.Null);
 
             // 2: Try a folder create that should work
             Assert.That(
                 userInfo.CreateFolder("testFolder2", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID), Is.True);
-            Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Not.Null);
+            Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Not.Null);
             Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.True);
         }
 
@@ -228,7 +228,7 @@ namespace OpenSim.Framework.Communications.Tests
                 Assert.That(newFolderName1, Is.EqualTo(folder1.Name));
                 Assert.That(folderType1, Is.EqualTo((ushort)folder1.Type));
 
-                InventoryFolderBase dataFolder1 = myScene.InventoryService.QueryFolder(myFolder);
+                InventoryFolderBase dataFolder1 = myScene.InventoryService.GetFolder(myFolder);
                 Assert.That(newFolderName1, Is.EqualTo(dataFolder1.Name));
                 Assert.That(folderType1, Is.EqualTo((ushort)dataFolder1.Type));
             }
@@ -254,7 +254,7 @@ namespace OpenSim.Framework.Communications.Tests
                 Assert.That(folder2.ContainsChildFolder(folder1Id), Is.True);
                 Assert.That(rootFolder.ContainsChildFolder(folder1Id), Is.False);
 
-                InventoryFolderBase dataFolder1 = myScene.InventoryService.QueryFolder(myFolder2);
+                InventoryFolderBase dataFolder1 = myScene.InventoryService.GetFolder(myFolder2);
                 Assert.That(newFolderName2, Is.EqualTo(dataFolder1.Name));
                 Assert.That(folderType2, Is.EqualTo((ushort)dataFolder1.Type));
                 Assert.That(folder2Id, Is.EqualTo(dataFolder1.ParentID));
@@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications.Tests
             InventoryFolderBase myFolder = new InventoryFolderBase();
             myFolder.ID = folderToMoveId;
             Assert.That(folder2.ContainsChildFolder(folderToMoveId), Is.True);
-            Assert.That(myScene.InventoryService.QueryFolder(myFolder).ParentID, Is.EqualTo(folder2Id));
+            Assert.That(myScene.InventoryService.GetFolder(myFolder).ParentID, Is.EqualTo(folder2Id));
 
             Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.False);
         }
@@ -322,13 +322,13 @@ namespace OpenSim.Framework.Communications.Tests
             myFolder.ID = folder1Id;
 
             userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID);
-            Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Not.Null);
+            Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Not.Null);
 
             // Test purge
             userInfo.PurgeFolder(rootFolder.ID);
 
             Assert.That(rootFolder.RequestListOfFolders(), Is.Empty);
-            Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Null);
+            Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index b1b7809..22dcef9 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -552,12 +552,12 @@ namespace OpenSim.Framework.Communications.Tests
             return false;
         }
 
-        public InventoryItemBase QueryItem(InventoryItemBase item)
+        public InventoryItemBase GetItem(InventoryItemBase item)
         {
             return null;
         }
 
-        public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+        public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             return null;
         }
@@ -575,5 +575,10 @@ namespace OpenSim.Framework.Communications.Tests
             root.ParentID = UUID.Zero;
             return root;
         }
+
+        public int GetAssetPermissions(UUID userID, UUID assetID)
+        {
+            return 1;
+        }
     }
 }
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 4307fe2..7150c82 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -354,7 +354,22 @@ namespace OpenSim.Framework
             }
         }
         protected int m_creationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
-        
+
+        public InventoryItemBase()
+        {
+        }
+
+        public InventoryItemBase(UUID id)
+        {
+            ID = id;
+        }
+
+        public InventoryItemBase(UUID id, UUID owner)
+        {
+            ID = id;
+            Owner = owner;
+        }
+
         public object Clone()
         {
             return MemberwiseClone();