4 files changed, 43 insertions, 25 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d5530a7..febb0bc 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -207,8 +207,27 @@
 [AssetService]
 
     ;; Choose an asset service (Only one option should be enabled)
-    Include-AssetConfig = "config-include/GridAssets_Default.ini"
-    ;Include-AssetConfig = "config-include/GridAssets_FSAssets.ini"
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+    ;LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
+    
+    ;; FSAsset Directories. Base directory, where final asset files are stored and Spool directory for temp files
+    ;; These directories must be on the same physical filesystem
+    ;BaseDirectory = "./fsassets/data"
+    ;SpoolDirectory = "./fsassets/tmp"
+    
+    ;; Original service can be checked if FSAssets can not find an asset
+    ;FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
+    
+    ;; How many days since last updating the access time before its updated again by FSAssets when accessing an asset
+    ;; Reduces DB calls if asset is requested oftern. Default value 0
+    ;DaysBetweenAccessTimeUpdates = 30
+    
+    ;; FSAssets Custom Database Config (Leave blank to use grids default database configuration)
+    ;StorageProvider = ""
+    ;ConnectionString = ""
+    ;Realm = "fsassets"
+    
+    ;; The Following Are Common to both the default asset service and FSAsset service
 
     ;; Common asset service options
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 89493cf..31595da 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -168,9 +168,29 @@
 [AssetService]
 
     ;; Choose an asset service (Only one option should be enabled)
-    Include-AssetConfig = "config-include/GridAssets_Default.ini"
-    ;Include-AssetConfig = "config-include/GridAssets_FSAssets.ini"
+    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
+    ;LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
     
+    ;; FSAsset Directories. Base directory, where final asset files are stored and Spool directory for temp files
+    ;; These directories must be on the same physical filesystem
+    ;BaseDirectory = "./fsassets/data"
+    ;SpoolDirectory = "./fsassets/tmp"
+    
+    ;; Original service can be checked if FSAssets can not find an asset
+    ;FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
+    
+    ;; How many days since last updating the access time before its updated again by FSAssets when accessing an asset
+    ;; Reduces DB calls if asset is requested oftern. Default value 0
+    ;DaysBetweenAccessTimeUpdates = 30
+    
+    ;; FSAssets Custom Database Config (Leave blank to use grids default database configuration)
+    ;StorageProvider = ""
+    ;ConnectionString = ""
+    ;Realm = "fsassets"
+    
+    ;; The Following Are Common to both the default asset service and FSAsset service
+    
+    ;; Default loader for loading default assets from XML on first run
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
 
diff --git a/bin/config-include/GridAssets_Default.ini b/bin/config-include/GridAssets_Default.ini
deleted file mode 100644
index 8ab4143..0000000
--- a/bin/config-include/GridAssets_Default.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[AssetService]
-
-    LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
\ No newline at end of file
diff --git a/bin/config-include/GridAssets_FSAssets.ini b/bin/config-include/GridAssets_FSAssets.ini
deleted file mode 100644
index 7d03518..0000000
--- a/bin/config-include/GridAssets_FSAssets.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[AssetService]
-
-    LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
-    
-    BaseDirectory = "./fsassets/data"
-    SpoolDirectory = "./fsassets/tmp"
-    
-    ;; Original service can be checked if FSAssets can not find an asset
-    FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
-    
-    ;; How many days since last updating the access time before its updated again when accessing an asset
-    ;; Reduces DB calls if asset is requested oftern. Default value 0
-    ;DaysBetweenAccessTimeUpdates = 30
-    
-    ;; Custom Database config (Leave blank to use grids default database configuration)
-    ;StorageProvider = ""
-    ;ConnectionString = ""
-    ;Realm = "fsassets"
\ No newline at end of file