7 files changed, 90 insertions, 43 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b3022f4..02047cf 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1221,48 +1221,20 @@
         ;FullUpdateRate=14
 
     ;PacketMTU = 1400
-
-    ; The following is the configuration section for the new style grid servers
-    ; If you don't know what this is, don't enable it. It will eat your data,
-    ; format your hard drive and make all meat in your fridge spoil.
-    ; You have been warned.
-    ; Some of this is starting to work!
-[Modules]
-    ; Choose one 
-    AssetServices = "LocalAssetServicesConnector"
-    ;AssetServices = "RemoteAssetServicesConnector"
-    ;AssetServices = "HGAssetBroker"
-
-        ; Leave this commented out, the cache is under investigation
-    ;AssetCache = "CoreAssetCache"
-
-    ; Choose one
-    ;UserServices = "LocalUserServicesConnector"
-    ;UserServices = "RemoteUserServicesConnector"
-
-
-[AssetService]
-    ; Parameters for local assets, formerly known as "standalone"
-    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
-    StorageProvider = "OpenSim.Data.SQLite.dll"
-    ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;"
-    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
-    AssetLoaderArgs = "assets/AssetSets.xml"
-
-    ; Parameters for remote assets, formerly known as "grid"
-    ;AssetServerURI = "http://localhost:8003/"
-
-    ; Paremeters for the Hypergrid connector
     
-    ;; Parameters for the HG Broker
-    ; Use this one if you have a standalone grid
-    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"
-    ; Use this one if this sim is connected to a grid-wide asset server
-    ;LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServiceConnector"
-    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"
-
-[AssetCache]
-    ; Number of buckets for assets
-    ;CacheBuckets = 32768
 
+        ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ;; The following is the configuration section for the new style services
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+[Architecture]
+        ; Choose exactly one and only one of the architectures below.
+        
+        Include-Standalone    = "config-include/Standalone.ini"
+        ;Include-HGStandalone = "config-include/StandaloneHypergrid.ini"
+        ;Include-Grid         = "config-include/Grid.ini"
+        ;Include-Hypergrid    = "config-include/GridHypergrid.ini"
+
+        ; Then edit 
+        ; config-include/StandaloneCommon.ini (if you're in standlone) OR
+        ; config-include/GridCommon.ini (if you're connected to a grid)
+        ; to customize your data
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
new file mode 100644
index 0000000..7f9db1c
--- /dev/null
+++ b/bin/config-include/Grid.ini
@@ -0,0 +1,6 @@
+[Includes]

+    Include-Common = "config-include/GridCommon.ini"

+

+[Modules]

+    AssetServices = "RemoteAssetServicesConnector"

+

diff --git a/bin/config-include/GridCommon.ini b/bin/config-include/GridCommon.ini
new file mode 100644
index 0000000..0e95f35
--- /dev/null
+++ b/bin/config-include/GridCommon.ini
@@ -0,0 +1,17 @@
+[Modules]

+    AssetCaching = "CoreAssetCache"

+

+[AssetCache]

+    ; Number of buckets for assets

+    CacheBuckets = 32768

+

+[AssetService]

+

+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"

+    AssetLoaderArgs = "assets/AssetSets.xml"

+

+    ;

+    ; change this to your grid-wide asset server

+    ;

+    AssetServerURI = "http://myassetserver.com:8003"

+

diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
new file mode 100644
index 0000000..5a93b79
--- /dev/null
+++ b/bin/config-include/GridHypergrid.ini
@@ -0,0 +1,10 @@
+[Includes]

+    Include-Common = "config-include/GridCommon.ini"

+

+[Modules]

+    AssetServices = "HGAssetBroker"

+

+

+[AssetService]

+    LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"

+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
new file mode 100644
index 0000000..c35cda9
--- /dev/null
+++ b/bin/config-include/Standalone.ini
@@ -0,0 +1,10 @@
+[Includes]

+    Include-Common = "config-include/StandaloneCommon.ini"

+

+[Modules]

+    AssetServices = "LocalAssetServicesConnector"

+

+

+[AssetService]

+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"

+

diff --git a/bin/config-include/StandaloneCommon.ini b/bin/config-include/StandaloneCommon.ini
new file mode 100644
index 0000000..a14c653
--- /dev/null
+++ b/bin/config-include/StandaloneCommon.ini
@@ -0,0 +1,21 @@
+[Modules]

+    AssetCaching = "CoreAssetCache"

+

+[AssetCache]

+    ; Number of buckets for assets

+    CacheBuckets = 16384

+

+[AssetService]

+    ;

+    ;### Choose the DB

+    ;

+    ;--- For SQLite

+    StorageProvider = "OpenSim.Data.SQLite.dll"

+    ;--- For MySql

+    ;StorageProvider = "OpenSim.Data.MySQL.dll"

+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"

+

+    DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"

+    AssetLoaderArgs = "assets/AssetSets.xml"

+

+

diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
new file mode 100644
index 0000000..eaee63d
--- /dev/null
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -0,0 +1,11 @@
+[Includes]

+    Include-Common = "config-include/StandaloneCommon.ini"

+

+[Modules]

+    AssetServices = "HGAssetBroker"

+

+

+[AssetService]

+    LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService"

+    HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService"

+