Add config options for FSAssetService. The default is the original asset service.

Signed-off-by: Melanie Thielker <melanie@t-data.com>

4 files changed, 32 insertions, 2 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 77ab355..d5530a7 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -205,7 +205,12 @@
 ; * in turn, reads the asset loader and database connection information
 ; *
 [AssetService]
-    LocalServiceModule = "OpenSim.Services.AssetService.dll: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"
+
+    ;; Common asset service options
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 0e70527..89493cf 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -166,7 +166,11 @@
 ; * in turn, reads the asset loader and database connection information
 ; *
 [AssetService]
-    LocalServiceModule = "OpenSim.Services.AssetService.dll: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"
+    
     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
new file mode 100644
index 0000000..8ab4143
--- /dev/null
+++ b/bin/config-include/GridAssets_Default.ini
@@ -0,0 +1,3 @@
+[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
new file mode 100644
index 0000000..7d03518
--- /dev/null
+++ b/bin/config-include/GridAssets_FSAssets.ini
@@ -0,0 +1,18 @@
+[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