Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

5 files changed, 12 insertions, 142 deletions

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index fc49169..7598cc3 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -245,7 +245,7 @@ namespace OpenSim.Tests.Common
             config.AddConfig("Modules");
             config.AddConfig("InventoryService");
             config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
-            config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:XInventoryService");
+            config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
             config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
 
             LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector();
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index 87d9410..b3a7c9e 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -199,9 +199,7 @@ namespace OpenSim.Tests.Common
             string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
 
             InventoryFolderBase newFolder 
-                = new InventoryFolderBase(
-                    UUID.Random(), components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0);
-            
+                = new InventoryFolderBase(UUID.Random(), components[0], parentFolder.Owner, parentFolder.ID);
             inventoryService.AddFolder(newFolder);
 
             if (components.Length > 1)
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 5ad3c9f..78bb18e 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -531,9 +531,13 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public virtual void SendChatMessage(
-            string message, byte type, Vector3 fromPos, string fromName,
-            UUID fromAgentID, UUID ownerID, byte source, byte audible)
+        public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName,
+                                            UUID fromAgentID, byte source, byte audible)
+        {
+        }
+
+        public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName,
+                                            UUID fromAgentID, byte source, byte audible)
         {
         }
 
@@ -935,12 +939,12 @@ namespace OpenSim.Tests.Common.Mock
             Close();
         }
 
-        public void Close()
+        public void Close(bool c)
         {
-            Close(true, false);
+            Close();
         }
 
-        public void Close(bool sendStop, bool force)
+        public void Close()
         {
             // Fire the callback for this connection closing
             // This is necesary to get the presence detector to notice that a client has logged out.
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
deleted file mode 100644
index bca5979..0000000
--- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Data;
-
-namespace OpenSim.Tests.Common.Mock
-{
-    public class TestXInventoryDataPlugin : IXInventoryData
-    {
-        private Dictionary<UUID, XInventoryFolder> m_allFolders = new Dictionary<UUID, XInventoryFolder>();
-        private Dictionary<UUID, XInventoryItem> m_allItems = new Dictionary<UUID, XInventoryItem>();
-
-        public TestXInventoryDataPlugin(string conn, string realm) {}
-
-        public XInventoryItem[] GetItems(string[] fields, string[] vals)
-        {
-            List<XInventoryItem> origItems = Get<XInventoryItem>(fields, vals, m_allItems.Values.ToList());
-
-            return origItems.Select(i => i.Clone()).ToArray();
-        }
-
-        public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
-        {
-            List<XInventoryFolder> origFolders
-                = Get<XInventoryFolder>(fields, vals, m_allFolders.Values.ToList());
-
-            return origFolders.Select(f => f.Clone()).ToArray();
-        }
-
-        private List<T> Get<T>(string[] fields, string[] vals, List<T> inputEntities)
-        {
-            List<T> entities = inputEntities;
-
-            for (int i = 0; i < fields.Length; i++)
-            {
-                entities
-                    = entities.Where(
-                        e =>
-                        {
-                            FieldInfo fi = typeof(T).GetField(fields[i]);
-                            if (fi == null)
-                                throw new NotImplementedException(string.Format("No field {0} for val {1}", fields[i], vals[i]));
-
-                            return fi.GetValue(e).ToString() == vals[i];
-                        }
-                    ).ToList();
-            }
-
-            return entities;
-        }
-
-        public bool StoreFolder(XInventoryFolder folder)
-        {
-            m_allFolders[folder.folderID] = folder.Clone();
-
-//            Console.WriteLine("Added folder {0} {1}", folder.folderName, folder.folderID);
-
-            return true;
-        }
-
-        public bool StoreItem(XInventoryItem item)
-        {
-            m_allItems[item.inventoryID] = item.Clone();
-
-//            Console.WriteLine("Added item {0} {1}, creator {2}, owner {3}", item.inventoryName, item.inventoryID, item.creatorID, item.avatarID);
-
-            return true;
-        }
-
-        public bool DeleteFolders(string field, string val)
-        {
-            return DeleteFolders(new string[] { field }, new string[] { val });
-        }
-
-        public bool DeleteFolders(string[] fields, string[] vals)
-        {
-            XInventoryFolder[] foldersToDelete = GetFolders(fields, vals);
-            Array.ForEach(foldersToDelete, f => m_allFolders.Remove(f.folderID));
-
-            return true;
-        }
-
-        public bool DeleteItems(string field, string val)
-        {
-            return DeleteItems(new string[] { field }, new string[] { val });
-        }
-
-        public bool DeleteItems(string[] fields, string[] vals)
-        {
-            XInventoryItem[] itemsToDelete = GetItems(fields, vals);
-            Array.ForEach(itemsToDelete, i => m_allItems.Remove(i.inventoryID));
-
-            return true;
-        }
-
-        public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); }
-        public XInventoryItem[] GetActiveGestures(UUID principalID) { throw new NotImplementedException(); }
-        public int GetAssetPermissions(UUID principalID, UUID assetID) { throw new NotImplementedException(); }
-    }
-}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs
index 57da802..30121fe 100644
--- a/OpenSim/Tests/Common/TestHelpers.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -95,7 +95,6 @@ namespace OpenSim.Tests.Common
         public static void EnableLogging()
         {
             log4net.Config.XmlConfigurator.Configure(EnableLoggingConfigStream);
-            EnableLoggingConfigStream.Position = 0;
         }
 
         /// <summary>