OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
0.8.2-post-fixes
AliciaRaven 2015-07-22 12:29:57 +01:00 committed by Oren Hurvitz
parent 3a2d4c8b05
commit 3e90d28d33
4 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bin/Robust.HG.ini.example
View File

@ -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"

24
bin/Robust.ini.example
View File

@ -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"

3
bin/config-include/GridAssets_Default.ini
View File

@ -1,3 +0,0 @@
[AssetService]
LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"

18
bin/config-include/GridAssets_FSAssets.ini
View File

@ -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"