seems to compile ( tests comented out)

2 files changed, 14 insertions, 112 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 4e6d196..1236e83 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -45,7 +45,6 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Framework.Client;
 using OpenSim.Services.Interfaces;
 
 using Caps = OpenSim.Framework.Capabilities.Caps;
@@ -360,8 +359,8 @@ namespace OpenSim.Region.ClientStack.Linden
         public string SeedCapRequest(string request, string path, string param,
                                   IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-//            m_log.DebugFormat(
-//                "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID);
+            m_log.DebugFormat(
+                "[CAPS]: Received SEED caps request in {0} for agent {1}", m_regionName, m_HostCapsObj.AgentID);
 
             if (!m_HostCapsObj.WaitForActivation())
                 return string.Empty;
@@ -789,99 +788,10 @@ namespace OpenSim.Region.ClientStack.Linden
             }
             else if (inventoryType == "object")
             {
-<<<<<<< HEAD
-                inType = (sbyte)InventoryType.Object;
-                assType = (sbyte)AssetType.Object;
-
-                List<Vector3> positions = new List<Vector3>();
-                List<Quaternion> rotations = new List<Quaternion>();
-                OSDMap request = (OSDMap)OSDParser.DeserializeLLSDXml(data);
-                OSDArray instance_list = (OSDArray)request["instance_list"];
-                OSDArray mesh_list = (OSDArray)request["mesh_list"];
-                OSDArray texture_list = (OSDArray)request["texture_list"];
-                SceneObjectGroup grp = null;
-
-                InventoryFolderBase textureUploadFolder = null;
-
-                List<InventoryFolderBase> foldersToUpdate = new List<InventoryFolderBase>();
-                List<InventoryItemBase> itemsToUpdate = new List<InventoryItemBase>();
-                IClientInventory clientInv = null;
-                
-                if (texture_list.Count > 0)
-                {
-                    ScenePresence avatar = null;
-                    m_Scene.TryGetScenePresence(m_HostCapsObj.AgentID, out avatar);
-
-                    if (avatar != null)
-                    {
-                        IClientCore core = (IClientCore)avatar.ControllingClient;
-
-                        if (core.TryGet<IClientInventory>(out clientInv))
-                        {
-                            var systemTextureFolder = m_Scene.InventoryService.GetFolderForType(m_HostCapsObj.AgentID, FolderType.Texture);
-                            textureUploadFolder = new InventoryFolderBase(UUID.Random(), assetName, m_HostCapsObj.AgentID, (short)FolderType.None, systemTextureFolder.ID, 1);
-                            if (m_Scene.InventoryService.AddFolder(textureUploadFolder))
-                            {
-                                foldersToUpdate.Add(textureUploadFolder);
-
-                                m_log.DebugFormat(
-                                    "[BUNCH OF CAPS]: Created new folder '{0}' ({1}) for textures uploaded with mesh object {2}", 
-                                    textureUploadFolder.Name, textureUploadFolder.ID, assetName);
-                            }
-                            else
-                            {
-                                textureUploadFolder = null;
-                            }
-                        }
-                    }
-                }
-
-                List<UUID> textures = new List<UUID>();
-                for (int i = 0; i < texture_list.Count; i++)
-                {
-                    AssetBase textureAsset = new AssetBase(UUID.Random(), assetName, (sbyte)AssetType.Texture, "");
-                    textureAsset.Data = texture_list[i].AsBinary();
-                    m_assetService.Store(textureAsset);
-                    textures.Add(textureAsset.FullID);
-
-                    if (textureUploadFolder != null)
-                    {
-                        InventoryItemBase textureItem = new InventoryItemBase();
-                        textureItem.Owner = m_HostCapsObj.AgentID;
-                        textureItem.CreatorId = m_HostCapsObj.AgentID.ToString();
-                        textureItem.CreatorData = String.Empty;
-                        textureItem.ID = UUID.Random();
-                        textureItem.AssetID = textureAsset.FullID;
-                        textureItem.Description = assetDescription;
-                        textureItem.Name = assetName + " - Texture " + (i + 1).ToString();
-                        textureItem.AssetType = (int)AssetType.Texture;
-                        textureItem.InvType = (int)InventoryType.Texture;
-                        textureItem.Folder = textureUploadFolder.ID;
-                        textureItem.CurrentPermissions
-                            = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export);
-                        textureItem.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export;
-                        textureItem.EveryOnePermissions = 0;
-                        textureItem.NextPermissions = (uint)PermissionMask.All;
-                        textureItem.CreationDate = Util.UnixTimeSinceEpoch();
-                        m_Scene.InventoryService.AddItem(textureItem);
-                        itemsToUpdate.Add(textureItem);
-
-                        m_log.DebugFormat(
-                            "[BUNCH OF CAPS]: Created new inventory item '{0}' ({1}) for texture uploaded with mesh object {2}", 
-                            textureItem.Name, textureItem.ID, assetName);
-                    }
-                }
-
-                if (clientInv != null && (foldersToUpdate.Count > 0 || itemsToUpdate.Count > 0))
-                {
-                    clientInv.SendBulkUpdateInventory(foldersToUpdate.ToArray(), itemsToUpdate.ToArray());
-                }
-=======
                 if (assetType == "mesh") // this code for now is for mesh models uploads only
                 {
                     inType = (sbyte)InventoryType.Object;
                     assType = (sbyte)AssetType.Object;
->>>>>>> avn/ubitvar
 
                     List<Vector3> positions = new List<Vector3>();
                     List<Quaternion> rotations = new List<Quaternion>();
@@ -1467,24 +1377,17 @@ namespace OpenSim.Region.ClientStack.Linden
                 {
                     string message;
                     copyItem = m_Scene.GiveInventoryItem(m_HostCapsObj.AgentID, item.Owner, itemID, folderID, out message);
-                    if (client != null)
+                    if (copyItem != null && client != null)
                     {
-                        if (copyItem != null)
-                        {
-                            m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder);
-                            client.SendBulkUpdateInventory(copyItem);
-                        }
-                        else
-                        {
-                            client.SendAgentAlertMessage(message, false);
-                        }
+                        m_log.InfoFormat("[CAPS]: CopyInventoryFromNotecard, ItemID:{0}, FolderID:{1}", copyItem.ID, copyItem.Folder);
+                        client.SendBulkUpdateInventory(copyItem);
                     }
                 }
                 else
                 {
                     m_log.ErrorFormat("[CAPS]: CopyInventoryFromNotecard - Failed to retrieve item {0} from notecard {1}", itemID, notecardID);
                     if (client != null)
-                        client.SendAgentAlertMessage("Failed to retrieve item", false);
+                        client.SendAlertMessage("Failed to retrieve item");
                 }
             }
             catch (Exception e)
@@ -1656,14 +1559,13 @@ namespace OpenSim.Region.ClientStack.Linden
                 string param, IOSHttpRequest httpRequest,
                 IOSHttpResponse httpResponse)
         {
-            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
-            OSDMap accessPrefs = (OSDMap)req["access_prefs"];
-            string desiredMaturity = accessPrefs["max"];
-
+//            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
             OSDMap resp = new OSDMap();
-            OSDMap respAccessPrefs = new OSDMap();
-            respAccessPrefs["max"] = desiredMaturity;   // echoing the maturity back means success
-            resp["access_prefs"] = respAccessPrefs;
+
+            OSDMap accessPrefs = new OSDMap();
+            accessPrefs["max"] = "A";
+
+            resp["access_prefs"] = accessPrefs;
 
             string response = OSDParser.SerializeLLSDXmlString(resp);
             return response; 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index c241075..b735dfa 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -40,8 +40,8 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 
-[assembly: Addin("LindenCaps", OpenSim.VersionInfo.VersionNumber)]
-[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
+[assembly: Addin("LindenCaps", "0.1")]
+[assembly: AddinDependency("OpenSim", "0.5")]
 namespace OpenSim.Region.ClientStack.Linden
 {