Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor

3 files changed, 16 insertions, 26 deletions

diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index 0535765..54101b0 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -122,17 +122,3 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
 
     WelcomeMessage = "Welcome, Avatar!"
-
-; * This is the new style grid service.
-; * "Realm" is the table that is used for user lookup.
-; * It defaults to "regions", which uses the legacy tables
-; *
-[GridService]
-LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
-ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=grid;"
-Realm = "regions"
-
-; If true, duplicate region names are allowed on the grid.  If false, no duplicate names are allowed
-; Default is false
-; AllowDuplicateNames = "True"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bd90df4..06333d8 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -4,9 +4,6 @@
 ;; which you can copy and change.
 ;;
 
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
-
 [Modules]
     AssetServices = "LocalAssetServicesConnector"
     InventoryServices = "LocalInventoryServicesConnector"
@@ -35,14 +32,14 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:avatars.db,version=3"
 
 [AuthorizationService]
     LocalServiceModule = "OpenSim.Services.AuthorizationService.dll:AuthorizationService"
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
         LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
@@ -55,7 +52,7 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:userprofiles.db,version=3"
     ;; These are for creating new accounts
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -72,3 +69,8 @@
     AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
     WelcomeMessage = "Welcome, Avatar!"
+
+
+;; This should always be the very last thing on this file
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a4fa5be..04a2356 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -3,9 +3,6 @@
 ;; All optional settings are in StandaloneCommon.ini.example,
 ;; which you can copy and change.
 ;;
-
-[Includes]
-    Include-Common = "config-include/StandaloneCommon.ini"
         
 [Modules]
     AssetServices = "HGAssetBroker"
@@ -45,7 +42,7 @@
 
 [AvatarService]
     LocalServiceModule    = "OpenSim.Services.AvatarService.dll:AvatarService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:avatars.db,version=3"
 
 [LibraryService]
         LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -57,7 +54,7 @@
 
 [AuthenticationService]
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:auth.db,version=3"
 
 [GridService]
         ; LocalGridServicesConnector needs this
@@ -73,7 +70,7 @@
 
 [UserAccountService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    StorageProvider = "OpenSim.Data.Null.dll"
+    ConnectionString = "URI=file:userprofiles.db,version=3"
     ;; These are for creating new accounts by the service
     AuthenticationService = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
@@ -112,3 +109,8 @@
 [HGInventoryService]
     ; For the InventoryServiceInConnector
     LocalServiceModule    = "OpenSim.Services.InventoryService.dll:HGInventoryService"
+
+
+;; This should always be the very last thing on this file
+[Includes]
+    Include-Common = "config-include/StandaloneCommon.ini"