8 files changed, 129 insertions, 6 deletions

diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index fc301c2..96bb7b3 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Communications
     public interface IInventoryServices
     {
         void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack);
-        void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder);
+        void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder);
         void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
         void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
         void CreateNewUserInventory(LLUUID user);
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index effe132..091d829 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Communications
             }
         }
 
-        public void deleteItem(InventoryItemBase item)
+        public void DeleteItem(InventoryItemBase item)
         {
             foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
             {
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.Communications
         public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
                                                      InventoryItemInfo itemCallBack);
 
-        public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder);
+        public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderBase folder);
         public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item);
         public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item);
     }
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index f1f2c2b..119f8a5 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -366,7 +366,7 @@ namespace OpenSim.Framework.UserManagement
         /// 
         /// </summary>
         /// <param name="user"></param>
-        public void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
+        public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
         {
             UserProfileData user = new UserProfileData();
             user.homeLocation = new LLVector3(128, 128, 100);
@@ -391,6 +391,8 @@ namespace OpenSim.Framework.UserManagement
                     MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
                 }
             }
+
+            return user.UUID;
         }
 
         public abstract UserProfileData SetupMasterUser(string firstName, string lastName);
diff --git a/OpenSim/Framework/IUserService.cs b/OpenSim/Framework/IUserService.cs
index d7857a4..67028a5 100644
--- a/OpenSim/Framework/IUserService.cs
+++ b/OpenSim/Framework/IUserService.cs
@@ -46,6 +46,6 @@ namespace OpenSim.Framework
         /// 
         /// </summary>
         /// <param name="user"></param>
-        void AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY);
+        LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 1233196..554cd30 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework
             configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to expect from user server", "null", false);
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
+                                                "DLL for database provider", "OpenSim.Framework.Data.SQLite.dll", false);
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
         }
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 80f631e..0ee30bb 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -245,6 +245,25 @@ namespace OpenSim.Framework
         void deleteInventoryFolder(LLUUID folder);
     }
 
+    public class InventoryCollection
+    {
+        public List<InventoryFolderBase> Folders;
+        public List<InventoryItemBase> AllItems;
+        public LLUUID UserID;
+
+        public InventoryCollection()
+        {
+            Folders = new List<InventoryFolderBase>();
+            AllItems = new List<InventoryItemBase>();
+        }
+
+        public InventoryCollection(List<InventoryFolderBase> folders, List<InventoryItemBase> allItems)
+        {
+            Folders = folders;
+            AllItems = allItems;
+        }
+    }
+
     /* 
      * .Net has some issues, serializing a dictionary, so we cannot reuse the InventoryFolder
      * class defined in Communications.Framework.Communications.Caches. So we serialize/deserialize
diff --git a/OpenSim/Framework/Servers/RestObjectPoster.cs b/OpenSim/Framework/Servers/RestObjectPoster.cs
index b77cbcc..07095f3 100644
--- a/OpenSim/Framework/Servers/RestObjectPoster.cs
+++ b/OpenSim/Framework/Servers/RestObjectPoster.cs
@@ -8,8 +8,11 @@ using System.Xml.Serialization;
 
 namespace OpenSim.Framework.Servers
 {
+    public delegate void ReturnResponse<T>(T reponse);
+
     public class RestObjectPoster
     {
+
         public static void BeginPostObject<TRequest>(string requestUrl, TRequest obj)
         {
             Type type = typeof(TRequest);
@@ -46,4 +49,93 @@ namespace OpenSim.Framework.Servers
             }
         }
     }
+
+    public class RestObjectPosterResponse<TResponse>
+    {
+        public ReturnResponse<TResponse> ReturnResponseVal;
+    
+        public  void BeginPostObject<TRequest>(string requestUrl, TRequest obj)
+        {
+            Type type = typeof(TRequest);
+
+            WebRequest request = WebRequest.Create(requestUrl);
+            request.Method = "POST";
+            request.ContentType = "text/xml";
+
+            MemoryStream buffer = new MemoryStream();
+
+            XmlWriterSettings settings = new XmlWriterSettings();
+            settings.Encoding = Encoding.UTF8;
+
+            using (XmlWriter writer = XmlWriter.Create(buffer, settings))
+            {
+                XmlSerializer serializer = new XmlSerializer(type);
+                serializer.Serialize(writer, obj);
+                writer.Flush();
+            }
+
+            int length = (int)buffer.Length;
+            request.ContentLength = length;
+
+            Stream requestStream = request.GetRequestStream();
+            requestStream.Write(buffer.ToArray(), 0, length);
+            IAsyncResult result = request.BeginGetResponse(AsyncCallback, request);
+        }
+
+        private void AsyncCallback(IAsyncResult result)
+        {
+            WebRequest request = (WebRequest)result.AsyncState;
+            using (WebResponse resp = request.EndGetResponse(result))
+            {
+                TResponse deserial;
+                XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
+                deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream());
+
+                if (deserial != null && ReturnResponseVal != null)
+                {
+                    ReturnResponseVal(deserial);
+                }
+            }
+        }
+    }
+
+    public class SyncRestObjectPoster
+    {
+
+        public static TResponse BeginPostObject<TRequest, TResponse>(string requestUrl, TRequest obj)
+        {
+            Type type = typeof(TRequest);
+
+            WebRequest request = WebRequest.Create(requestUrl);
+            request.Method = "POST";
+            request.ContentType = "text/xml";
+
+            MemoryStream buffer = new MemoryStream();
+
+            XmlWriterSettings settings = new XmlWriterSettings();
+            settings.Encoding = Encoding.UTF8;
+
+            using (XmlWriter writer = XmlWriter.Create(buffer, settings))
+            {
+                XmlSerializer serializer = new XmlSerializer(type);
+                serializer.Serialize(writer, obj);
+                writer.Flush();
+            }
+
+            int length = (int)buffer.Length;
+            request.ContentLength = length;
+
+            Stream requestStream = request.GetRequestStream();
+            requestStream.Write(buffer.ToArray(), 0, length);
+            TResponse deserial = default(TResponse);
+            using (WebResponse resp = request.GetResponse())
+            {
+               
+                XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
+                deserial = (TResponse)deserializer.Deserialize(resp.GetResponseStream());
+            }
+            return deserial;
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index d4ee62f..4c6b3b8 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -38,6 +38,8 @@ namespace OpenSim.Framework
         public string GridSendKey = "";
         public string GridRecvKey = "";
 
+        public string InventoryUrl = "";
+
         public string DatabaseProvider = "";
 
         public static uint DefaultHttpPort = 8002;
@@ -68,6 +70,11 @@ namespace OpenSim.Framework
                                                 "Key to send to grid server", "null", false);
             configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to expect from grid server", "null", false);
+
+            configMember.addConfigurationOption("default_inventory_server",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "Default Inventory Server URI",
+                                                "http://127.0.0.1:8004/", false);
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
 
@@ -95,6 +102,9 @@ namespace OpenSim.Framework
                 case "grid_recv_key":
                     GridRecvKey = (string) configuration_result;
                     break;
+                case "default_inventory_server":
+                    InventoryUrl = (string)configuration_result;
+                    break;
                 case "database_provider":
                     DatabaseProvider = (string) configuration_result;
                     break;