11 files changed, 99 insertions, 105 deletions

diff --git a/OpenSim/Data/SQLite/Resources/001_XInventoryStore.sql b/OpenSim/Data/SQLite/Resources/001_XInventoryStore.sql
new file mode 100644
index 0000000..7e21996
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/001_XInventoryStore.sql
@@ -0,0 +1,38 @@
+BEGIN TRANSACTION;
+
+CREATE TABLE inventoryfolders(
+       folderName varchar(255),
+       type integer,
+       version integer,
+       folderID varchar(255) primary key,
+       agentID varchar(255) not null default '00000000-0000-0000-0000-000000000000',
+       parentFolderID varchar(255) not null default '00000000-0000-0000-0000-000000000000');
+
+CREATE TABLE inventoryitems(
+       assetID varchar(255),
+       assetType integer,
+       inventoryName varchar(255),
+       inventoryDescription varchar(255),
+       inventoryNextPermissions integer,
+       inventoryCurrentPermissions integer,
+       invType integer,
+       creatorID varchar(255),
+       inventoryBasePermissions integer,
+       inventoryEveryOnePermissions integer, 
+       salePrice integer default 99, 
+       saleType integer default 0, 
+       creationDate integer default 2000, 
+       groupID varchar(255) default '00000000-0000-0000-0000-000000000000', 
+       groupOwned integer default 0, 
+       flags integer default 0,
+       inventoryID varchar(255) primary key,
+       parentFolderID varchar(255) not null default '00000000-0000-0000-0000-000000000000',
+       avatarID varchar(255) not null default '00000000-0000-0000-0000-000000000000',
+       inventoryGroupPermissions integer not null default 0);
+
+create index inventoryfolders_agentid on inventoryfolders(agentID);
+create index inventoryfolders_parentid on inventoryfolders(parentFolderID);
+create index inventoryitems_parentfolderid on inventoryitems(parentFolderID);
+create index inventoryitems_avatarid on inventoryitems(avatarID);
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql b/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql
new file mode 100644
index 0000000..545d233
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/002_XInventoryStore.sql
@@ -0,0 +1,9 @@
+BEGIN TRANSACTION;
+
+ATTACH 'inventoryStore.db' AS old;
+
+INSERT INTO inventoryfolders (folderName, type, version, folderID, agentID, parentFolderID) SELECT `name` AS folderName, `type` AS type, `version` AS version, `UUID` AS folderID, `agentID` AS agentID, `parentID` AS parentFolderID from old.inventoryfolders;
+
+INSERT INTO inventoryitems (assetID, assetType, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryID, parentFolderID, avatarID, inventoryGroupPermissions) SELECT `assetID`, `assetType` AS assetType, `inventoryName` AS inventoryName, `inventoryDescription` AS inventoryDescription, `inventoryNextPermissions` AS inventoryNextPermissions, `inventoryCurrentPermissions` AS inventoryCurrentPermissions, `invType` AS invType, `creatorsID` AS creatorID, `inventoryBasePermissions` AS inventoryBasePermissions, `inventoryEveryOnePermissions` AS inventoryEveryOnePermissions, `salePrice` AS salePrice, `saleType` AS saleType, `creationDate` AS creationDate, `groupID` AS groupID, `groupOwned` AS groupOwned, `flags` AS flags, `UUID` AS inventoryID, `parentFolderID` AS parentFolderID, `avatarID` AS avatarID, `inventoryGroupPermissions` AS inventoryGroupPermissions FROM old.inventoryitems;
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index be1d041..6064538 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Data.SQLite
         public SQLiteXInventoryData(string conn, string realm)
         {
             m_Folders = new SQLiteGenericTableHandler<XInventoryFolder>(
-                    conn, "inventoryfolders", "InventoryStore");
+                    conn, "inventoryfolders", "XInventoryStore");
             m_Items = new SqliteItemHandler(
                     conn, "inventoryitems", String.Empty);
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index a2f26d5..22bd04c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -41,7 +41,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
-    public class LocalInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService
+    public class LocalInventoryServicesConnector : ISharedRegionModule, IInventoryService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -50,7 +50,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         private IInventoryService m_InventoryService;
 
         private bool m_Enabled = false;
-        private bool m_Initialized = false;
 
         public Type ReplaceableInterface 
         {
@@ -93,23 +92,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                     if (m_InventoryService == null)
                     {
                         m_log.Error("[LOCAL INVENTORY SERVICES CONNECTOR]: Can't load inventory service");
-                        //return;
                         throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
                     }
 
-                    //List<IInventoryDataPlugin> plugins
-                    //    = DataPluginFactory.LoadDataPlugins<IInventoryDataPlugin>(
-                    //        configSettings.StandaloneInventoryPlugin,
-                    //        configSettings.StandaloneInventorySource);
-
-                    //foreach (IInventoryDataPlugin plugin in plugins)
-                    //{
-                    //    // Using the OSP wrapper plugin for database plugins should be made configurable at some point
-                    //    m_InventoryService.AddPlugin(new OspInventoryWrapperPlugin(plugin, this));
-                    //}
-
-                    Init(source);
-
                     m_Enabled = true;
                     m_log.Info("[LOCAL INVENTORY SERVICES CONNECTOR]: Local inventory connector enabled");
                 }
@@ -128,99 +113,60 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
             if (!m_Enabled)
                 return;
-
-            if (!m_Initialized)
-            {
-                m_Initialized = true;
-            }
-
-//            m_log.DebugFormat(
-//                "[LOCAL INVENTORY SERVICES CONNECTOR]: Registering IInventoryService to scene {0}", scene.RegionInfo.RegionName);
             
             scene.RegisterModuleInterface<IInventoryService>(this);
-            m_cache.AddRegion(scene);
         }
 
         public void RemoveRegion(Scene scene)
         {
             if (!m_Enabled)
                 return;
-
-            m_cache.RemoveRegion(scene);
         }
 
         public void RegionLoaded(Scene scene)
         {
             if (!m_Enabled)
                 return;
-
-            m_log.InfoFormat(
-                "[LOCAL INVENTORY SERVICES CONNECTOR]: Enabled local inventory for region {0}", scene.RegionInfo.RegionName);
         }
 
         #region IInventoryService
 
-        public override bool CreateUserInventory(UUID user)
+        public bool CreateUserInventory(UUID user)
         {
             return m_InventoryService.CreateUserInventory(user);
         }
 
-        public override List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
         {
             return m_InventoryService.GetInventorySkeleton(userId);
         }
 
-        public override InventoryCollection GetUserInventory(UUID id)
+        public InventoryCollection GetUserInventory(UUID id)
         {
             return m_InventoryService.GetUserInventory(id);
         }
 
-        public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
+        public void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
         {
             m_InventoryService.GetUserInventory(userID, callback);
         }
 
-        // Inherited. See base
-        //public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-        //{
-        //    return m_InventoryService.GetFolderForType(userID, type);
-        //}
-
-        public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
+        public InventoryFolderBase GetRootFolder(UUID userID)
         {
-            InventoryFolderBase root = m_InventoryService.GetRootFolder(userID);
-            if (root != null)
-            {
-                InventoryCollection content = GetFolderContent(userID, root.ID);
-                if (content != null)
-                {
-                    Dictionary<AssetType, InventoryFolderBase> folders = new Dictionary<AssetType, InventoryFolderBase>();
-                    foreach (InventoryFolderBase folder in content.Folders)
-                    {
-                        if ((folder.Type != (short)AssetType.Folder) && (folder.Type != (short)AssetType.Unknown))
-                        {
-                            //m_log.InfoFormat("[INVENTORY CONNECTOR]: folder type {0} ", folder.Type);
-                            folders[(AssetType)folder.Type] = folder;
-                        }
-                    }
-                    // Put the root folder there, as type Folder
-                    folders[AssetType.Folder] = root;
-                    //m_log.InfoFormat("[INVENTORY CONNECTOR]: root folder is type {0} ", root.Type);
+            return m_InventoryService.GetRootFolder(userID);
+        }
 
-                    return folders;
-                }
-            }
-            m_log.WarnFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: System folders for {0} not found", userID);
-            return new Dictionary<AssetType, InventoryFolderBase>();
+        public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
+        {
+            return m_InventoryService.GetFolderForType(userID, type);
         }
 
-        public override InventoryCollection GetFolderContent(UUID userID, UUID folderID)
+        public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
             return m_InventoryService.GetFolderContent(userID, folderID);
         }
 
-
-        public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
         {
             return m_InventoryService.GetFolderItems(userID, folderID);
         }
@@ -230,7 +176,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// </summary>
         /// <param name="folder"></param>
         /// <returns>true if the folder was successfully added</returns>
-        public override bool AddFolder(InventoryFolderBase folder)
+        public bool AddFolder(InventoryFolderBase folder)
         {
             return m_InventoryService.AddFolder(folder);
         }
@@ -240,7 +186,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// </summary>
         /// <param name="folder"></param>
         /// <returns>true if the folder was successfully updated</returns>
-        public override bool UpdateFolder(InventoryFolderBase folder)
+        public bool UpdateFolder(InventoryFolderBase folder)
         {
             return m_InventoryService.UpdateFolder(folder);
         }
@@ -250,12 +196,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// </summary>
         /// <param name="folder">A folder containing the details of the new location</param>
         /// <returns>true if the folder was successfully moved</returns>
-        public override bool MoveFolder(InventoryFolderBase folder)
+        public bool MoveFolder(InventoryFolderBase folder)
         {
             return m_InventoryService.MoveFolder(folder);
         }
 
-        public override bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
+        public bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
         {
             return m_InventoryService.DeleteFolders(ownerID, folderIDs);
         }
@@ -265,18 +211,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// </summary>
         /// <param name="folder"></param>
         /// <returns>true if the folder was successfully purged</returns>
-        public override bool PurgeFolder(InventoryFolderBase folder)
+        public bool PurgeFolder(InventoryFolderBase folder)
         {
             return m_InventoryService.PurgeFolder(folder);
         }
 
         /// <summary>
-        /// Add a new item to the user's inventory, plain
-        /// Called by base class AddItem
+        /// Add a new item to the user's inventory
         /// </summary>
         /// <param name="item"></param>
         /// <returns>true if the item was successfully added</returns>
-        protected override bool AddItemPlain(InventoryItemBase item)
+        public bool AddItem(InventoryItemBase item)
         {
             return m_InventoryService.AddItem(item);
         }
@@ -286,13 +231,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// </summary>
         /// <param name="item"></param>
         /// <returns>true if the item was successfully updated</returns>
-        public override bool UpdateItem(InventoryItemBase item)
+        public bool UpdateItem(InventoryItemBase item)
         {
             return m_InventoryService.UpdateItem(item);
         }
 
 
-        public override bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
+        public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
         {
             return m_InventoryService.MoveItems(ownerID, items);
         }
@@ -302,12 +247,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// </summary>
         /// <param name="item"></param>
         /// <returns>true if the item was successfully deleted</returns>
-        public override bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
+        public bool DeleteItems(UUID ownerID, List<UUID> itemIDs)
         {
             return m_InventoryService.DeleteItems(ownerID, itemIDs);
         }
 
-        public override InventoryItemBase GetItem(InventoryItemBase item)
+        public InventoryItemBase GetItem(InventoryItemBase item)
         {
 //            m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID);
 
@@ -322,7 +267,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             return item;
         }
 
-        public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
+        public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             return m_InventoryService.GetFolder(folder);
         }
@@ -332,17 +277,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         /// </summary>
         /// <param name="userID"></param>
         /// <returns></returns>
-        public override bool HasInventoryForUser(UUID userID)
+        public bool HasInventoryForUser(UUID userID)
         {
             return m_InventoryService.HasInventoryForUser(userID);
         }
 
-        public override List<InventoryItemBase> GetActiveGestures(UUID userId)
+        public List<InventoryItemBase> GetActiveGestures(UUID userId)
         {
             return m_InventoryService.GetActiveGestures(userId);
         }
 
-        public override int GetAssetPermissions(UUID userID, UUID assetID)
+        public int GetAssetPermissions(UUID userID, UUID assetID)
         {
             return m_InventoryService.GetAssetPermissions(userID, assetID);
         }
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 5e3f9a7..489b66f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -11,7 +11,7 @@
 ;;
 
 [Startup]
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8003/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector,8002/OpenSim.Server.Handlers.dll:GatekeeperServiceInConnector,8002/OpenSim.Server.Handlers.dll:UserAgentServerConnector,HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none if specified above
@@ -44,8 +44,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 ; * the function of the legacy inventory server
 ; *
 [InventoryService]
-    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
-    SessionAuthentication = "false"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 ; * This is the new style grid service.
 ; * "Realm" is the table that is used for user lookup.
@@ -92,7 +91,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [PresenceService]
     ; for the server connector
@@ -116,7 +115,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; for the service
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 9bedac6..cfc08bc 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -11,7 +11,7 @@
 ; *
 [Startup]
 
-ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:InventoryServiceInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
+ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003/OpenSim.Server.Handlers.dll:XInventoryInConnector,8002/OpenSim.Server.Handlers.dll:FreeswitchServerConnector,8003/OpenSim.Server.Handlers.dll:GridServiceConnector,8002/OpenSim.Server.Handlers.dll:GridInfoServerInConnector,8003/OpenSim.Server.Handlers.dll:AuthenticationServiceConnector,8002/OpenSim.Server.Handlers.dll:OpenIdServerConnector,8003/OpenSim.Server.Handlers.dll:AvatarServiceConnector,8002/OpenSim.Server.Handlers.dll:LLLoginServiceInConnector,8003/OpenSim.Server.Handlers.dll:PresenceServiceConnector,8003/OpenSim.Server.Handlers.dll:UserAccountServiceConnector,8003/OpenSim.Server.Handlers.dll:FriendsServiceConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none if specified above
@@ -45,8 +45,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 ; * the function of the legacy inventory server
 ; *
 [InventoryService]
-    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
-    SessionAuthentication = "false"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 ; * This is the new style grid service.
 ; * "Realm" is the table that is used for user lookup.
@@ -94,7 +93,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [PresenceService]
     ; for the server connector
@@ -118,7 +117,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; for the service
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 9dff325..4767cbc 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -9,7 +9,7 @@
 
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
-    InventoryServices = "RemoteInventoryServicesConnector"
+    InventoryServices = "RemoteXInventoryServicesConnector"
     GridServices = "RemoteGridServicesConnector"
     AvatarServices = "RemoteAvatarServicesConnector"
     NeighbourServices = "RemoteNeighbourServicesConnector"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index b567817..051a87e 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -30,8 +30,7 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteInventoryServicesConnector"
-    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+    LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector"
 
 [GridService]
         ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 92c2154..027b4ea 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -24,7 +24,7 @@
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
 
 [InventoryService]
-    LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService"
+    LocalServiceModule = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [LibraryService]
         LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -56,7 +56,7 @@
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [GridUserService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
@@ -71,7 +71,7 @@
     LocalServiceModule    = "OpenSim.Services.LLLoginService.dll:LLLoginService"
     UserAccountService    = "OpenSim.Services.UserAccountService.dll:UserAccountService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService      = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService      = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService       = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService           = "OpenSim.Services.GridService.dll:GridService"
     AvatarService         = "OpenSim.Services.AvatarService.dll:AvatarService"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 1d8e2ef..35e6f20 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -33,11 +33,10 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:InventoryService"
+    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
     ; For HGInventoryBroker
-    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
-    HypergridInventoryService = "OpenSim.Services.Connectors.dll:HGInventoryServiceConnector"
+    LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
@@ -74,7 +73,7 @@
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
 [FriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll"
@@ -88,7 +87,7 @@
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
         UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    InventoryService = "OpenSim.Services.InventoryService.dll:InventoryService"
+    InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index 1ce0357..ed88a8a 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -3,6 +3,11 @@
 [DatabaseService]
     StorageProvider = "OpenSim.Data.SQLite.dll"
 
+[InventoryService]
+    ;ConnectionString = "URI=file:inventory.db,version=3"
+    ; if you have a legacy inventory store use the connection string below
+    ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True"
+
 [AvatarService]
     ConnectionString = "URI=file:avatars.db,version=3"
 
@@ -14,3 +19,4 @@
 
 [FriendsService]
     ConnectionString = "URI=file:friends.db,version=3"
+