aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/config-include
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-12 14:20:26 -0700
committerJohn Hurliman2010-09-12 14:20:26 -0700
commit0db1ed0b5a6f5bd104c6008f142d173c84263ce5 (patch)
tree05b1b67544242755ef0150d8134d549a1a0fcbe3 /bin/config-include
parentAdded a stub for OpenSim.Services.Connectors.Simulation.SimulationDataService... (diff)
downloadopensim-SC_OLD-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.zip
opensim-SC_OLD-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.gz
opensim-SC_OLD-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.bz2
opensim-SC_OLD-0db1ed0b5a6f5bd104c6008f142d173c84263ce5.tar.xz
* Added ISimulationDataService and IEstateDataService
* Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
Diffstat (limited to '')
-rw-r--r--bin/config-include/Grid.ini5
-rw-r--r--bin/config-include/GridCommon.ini.example21
-rw-r--r--bin/config-include/GridHypergrid.ini6
-rw-r--r--bin/config-include/HyperSimianGrid.ini6
-rw-r--r--bin/config-include/SimianGrid.ini6
-rw-r--r--bin/config-include/Standalone.ini6
-rw-r--r--bin/config-include/StandaloneCommon.ini.example2
7 files changed, 52 insertions, 0 deletions
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 @@
27 SimulationServiceInConnector = true 27 SimulationServiceInConnector = true
28 LibraryModule = true 28 LibraryModule = true
29 29
30[SimulationDataStore]
31 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
32
33[EstateDataStore]
34 LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
30 35
31[GridService] 36[GridService]
32 LocalServiceModule = "OpenSim.Services.GridService.dll:GridService" 37 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 @@
1[DatabaseService]
2 ;
3 ; ### Choose the DB
4 ;
5
6 ; SQLite
7 Include-Storage = "config-include/storage/SQLiteStandalone.ini";
8
9 ; Unfortunately the current SQLite database plugin is not compatible with Mac OSX. You can still use the older
10 ; legacy sqlite library if you are using Mono 2.4. Please see the notes in OpenSim.ini (search for sqlite)
11 ; for more details
12 ;Include-Storage = "config-include/storage/SQLiteLegacyStandalone.ini";
13
14 ; MySql
15 ; Uncomment these lines if you want to use mysql storage
16 ; Change the connection string to your db details
17 ;StorageProvider = "OpenSim.Data.MySQL.dll"
18 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
19 ; Uncomment this line if you are using MySQL and want to use a different database for estates
20 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
21
1[AssetService] 22[AssetService]
2 23
3 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 24 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 @@
30 SimulationServiceInConnector = true 30 SimulationServiceInConnector = true
31 LibraryModule = true 31 LibraryModule = true
32 32
33[SimulationDataStore]
34 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
35
36[EstateDataStore]
37 LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
38
33[AssetService] 39[AssetService]
34 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" 40 LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
35 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector" 41 HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
diff --git a/bin/config-include/HyperSimianGrid.ini b/bin/config-include/HyperSimianGrid.ini
index 49ba2ca..29b51de 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/bin/config-include/HyperSimianGrid.ini
@@ -41,6 +41,12 @@
41 41
42 AssetCaching = "FlotsamAssetCache" 42 AssetCaching = "FlotsamAssetCache"
43 43
44[SimulationDataStore]
45 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
46
47[EstateDataStore]
48 LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
49
44[Friends] 50[Friends]
45 Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector" 51 Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
46 52
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 9b27cc7..239ce30 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -41,6 +41,12 @@
41 41
42 AssetCaching = "FlotsamAssetCache" 42 AssetCaching = "FlotsamAssetCache"
43 43
44[SimulationDataStore]
45 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
46
47[EstateDataStore]
48 LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
49
44[Friends] 50[Friends]
45 Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector" 51 Connector = "OpenSim.Services.Connectors.dll:SimianFriendsServiceConnector"
46 52
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 @@
22 LLLoginServiceInConnector = true 22 LLLoginServiceInConnector = true
23 GridInfoServiceInConnector = true 23 GridInfoServiceInConnector = true
24 24
25[SimulationDataStore]
26 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
27
28[EstateDataStore]
29 LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
30
25[AssetService] 31[AssetService]
26 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" 32 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
27 33
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 @@
18 ; Change the connection string to your db details 18 ; Change the connection string to your db details
19 ;StorageProvider = "OpenSim.Data.MySQL.dll" 19 ;StorageProvider = "OpenSim.Data.MySQL.dll"
20 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;" 20 ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
21 ; Uncomment this line if you are using MySQL and want to use a different database for estates
22 ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
21 23
22[AssetService] 24[AssetService]
23 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 25 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"