From 3e90d28d33d10454016f4d3a8afec007186cd427 Mon Sep 17 00:00:00 2001
From: AliciaRaven
Date: Wed, 22 Jul 2015 12:29:57 +0100
Subject: Robust config loader does not support config includes. Replace these
 additions for FSAssets with direct options in robust.ini example files
 instead.

As suggested by Orenh in mantis 7644, in the future it would be beneficial and less confusing to use only 1 of the 3 current config loaders.

Signed-off-by: Oren Hurvitz <orenh@kitely.com>
---
 bin/Robust.HG.ini.example                  | 23 +++++++++++++++++++++--
 bin/Robust.ini.example                     | 24 ++++++++++++++++++++++--
 bin/config-include/GridAssets_Default.ini  |  3 ---
 bin/config-include/GridAssets_FSAssets.ini | 18 ------------------
 4 files changed, 43 insertions(+), 25 deletions(-)
 delete mode 100644 bin/config-include/GridAssets_Default.ini
 delete mode 100644 bin/config-include/GridAssets_FSAssets.ini

(limited to 'bin')

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
-- 
cgit v1.1