Merge branch 'master' into careminster-presence-refactor

The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.

10 files changed, 67 insertions, 42 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9fd7e46..ef8f73a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -106,33 +106,6 @@
     ; ## PRIM STORAGE
     ; ##
 
-    ; *** Prim Storage - only leave one storage_plugin uncommented ***
-    ; --- Null stores nothing - effectively disabling persistence:
-    ;storage_plugin = "OpenSim.Data.Null.dll"
-
-    ; --- To use sqlite as region storage:
-    ;
-    ; PLEASE NOTE: Unfortunately, the current SQLite database plugin (necessary to use SQLite with Mono on Linux) is 
-    ; not compatible with the sqlite3 library installed on Mac OSX.  If you're using Mono 2.4 you can still use the old sqlite
-    ; library by uncommenting the SQLiteLegacy.dll storage plugin (and commenting out SQLite.dll).  Unfortunately, the older library
-    ; will not work with Mono 2.6 on Mac OSX so you will either need to replace the OSX sqlite3 system library or use MySQL instead
-    ;
-    ; You will also need to do the same thing in config-include/StandaloneCommon.ini if you are running in standalone mode
-    storage_plugin = "OpenSim.Data.SQLite.dll"
-    ;storage_plugin = "OpenSim.Data.SQLiteLegacy.dll"
-    storage_connection_string="URI=file:OpenSim.db,version=3";
-
-    ; --- To use MySQL storage, supply your own connection string (this is only an example):
-    ;     note that the supplied account needs create privilegies if you want it to auto-create needed tables.
-    ;
-    ; -->>> There are multiple connection strings defined in several places. Check it carefully!
-    ;
-    ; storage_plugin="OpenSim.Data.MySQL.dll"
-    ; storage_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;";
-    ; If you want to use a different database/server for estate data, then
-    ; uncomment and change this connect string. Defaults to the above if not set
-    ; estate_connection_string="Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;";
-
     ; Persistence of changed objects happens during regular sweeps. The following control that behaviour to
     ; prevent frequently changing objects from heavily loading the region data store.
     ; If both of these values are set to zero then persistence of all changed objects will happen on every sweep.
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index eb4c224..d79227c 100755
--- a/bin/Prebuild.exe
+++ b/bin/Prebuild.exe
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index dae7a19..deceb86 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,7 +21,7 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-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:GridUserServiceConnector,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"
+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:GridUserServiceConnector,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,8002/OpenSim.Server.Handlers.dll:HeloServiceInConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none if specified above
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 9a75f19..4a6a082 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -27,6 +27,11 @@
     SimulationServiceInConnector        = true
     LibraryModule                                       = true
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index a19591b..c2cd5c3 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,3 +1,24 @@
+[DatabaseService]
+    ;
+    ; ### Choose the DB
+    ;
+
+    ; SQLite
+    Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+
+    ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX.  You can still use the older
+    ; legacy sqlite library if you are using Mono 2.4.  Please see the notes in OpenSim.ini (search for sqlite)
+    ; for more details
+    ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
+
+    ; MySql  
+    ; Uncomment these lines if you want to use mysql storage 
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.MySQL.dll"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ; Uncomment this line if you are using MySQL and want to use a different database for estates
+    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+
 [AssetService]
 
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index ab29018..d69a945 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -30,6 +30,12 @@
     SimulationServiceInConnector        = true
     LibraryModule                                       = true
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [AssetService]
     LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 87ffe69..29b51de 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -21,13 +21,13 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
+    GridServices = "SimianGridServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
     AssetServices = "HGAssetBroker"
     InventoryServices = "HGInventoryBroker"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
     
     NeighbourServices = "RemoteNeighbourServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
@@ -41,6 +41,12 @@
     
     AssetCaching = "FlotsamAssetCache"
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
 
@@ -74,4 +80,4 @@
     ServicesConnectorModule = SimianGroupsServicesConnector
 
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 65d4ea6..239ce30 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -21,13 +21,13 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
-    PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
-    UserAccountServices = "OpenSim.Services.Connectors.dll:SimianUserAccountServiceConnector"
-    AuthenticationServices = "OpenSim.Services.Connectors.dll:SimianAuthenticationServiceConnector"
-    AssetServices = "OpenSim.Services.Connectors.dll:SimianAssetServiceConnector"
-    InventoryServices = "OpenSim.Services.Connectors.dll:SimianInventoryServiceConnector"
-    AvatarServices = "OpenSim.Services.Connectors.dll:SimianAvatarServiceConnector"
+    GridServices = "SimianGridServiceConnector"
+    PresenceServices = "SimianPresenceServiceConnector"
+    UserAccountServices = "SimianUserAccountServiceConnector"
+    AuthenticationServices = "SimianAuthenticationServiceConnector"
+    AssetServices = "SimianAssetServiceConnector"
+    InventoryServices = "SimianInventoryServiceConnector"
+    AvatarServices = "SimianAvatarServiceConnector"
     
     NeighbourServices = "RemoteNeighbourServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
@@ -41,6 +41,12 @@
     
     AssetCaching = "FlotsamAssetCache"
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [Friends]
     Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
 
@@ -67,4 +73,4 @@
     ServicesConnectorModule = SimianGroupsServicesConnector
 
 [Profiles]
-    Module  = SimianProfiles
+    Module = "SimianProfiles"
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index eae9801..d74b50e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -22,6 +22,12 @@
     LLLoginServiceInConnector   = true
     GridInfoServiceInConnector  = true
 
+[SimulationDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+
+[EstateDataStore]
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+
 [AssetService]
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f862960..96ef602 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -18,6 +18,8 @@
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
     ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+    ; Uncomment this line if you are using MySQL and want to use a different database for estates
+    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
 
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"