Merge branch 'master' into careminster-presence-refactor

7 files changed, 23 insertions, 21 deletions

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"
+