aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--bin/Robust.HG.ini.example23
-rw-r--r--bin/Robust.ini.example24
-rw-r--r--bin/config-include/GridAssets_Default.ini3
-rw-r--r--bin/config-include/GridAssets_FSAssets.ini18
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 @@
207[AssetService] 207[AssetService]
208 208
209 ;; Choose an asset service (Only one option should be enabled) 209 ;; Choose an asset service (Only one option should be enabled)
210 Include-AssetConfig = "config-include/GridAssets_Default.ini" 210 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
211 ;Include-AssetConfig = "config-include/GridAssets_FSAssets.ini" 211 ;LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
212
213 ;; FSAsset Directories. Base directory, where final asset files are stored and Spool directory for temp files
214 ;; These directories must be on the same physical filesystem
215 ;BaseDirectory = "./fsassets/data"
216 ;SpoolDirectory = "./fsassets/tmp"
217
218 ;; Original service can be checked if FSAssets can not find an asset
219 ;FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
220
221 ;; How many days since last updating the access time before its updated again by FSAssets when accessing an asset
222 ;; Reduces DB calls if asset is requested oftern. Default value 0
223 ;DaysBetweenAccessTimeUpdates = 30
224
225 ;; FSAssets Custom Database Config (Leave blank to use grids default database configuration)
226 ;StorageProvider = ""
227 ;ConnectionString = ""
228 ;Realm = "fsassets"
229
230 ;; The Following Are Common to both the default asset service and FSAsset service
212 231
213 ;; Common asset service options 232 ;; Common asset service options
214 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 233 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 @@
168[AssetService] 168[AssetService]
169 169
170 ;; Choose an asset service (Only one option should be enabled) 170 ;; Choose an asset service (Only one option should be enabled)
171 Include-AssetConfig = "config-include/GridAssets_Default.ini" 171 LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
172 ;Include-AssetConfig = "config-include/GridAssets_FSAssets.ini" 172 ;LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
173 173
174 ;; FSAsset Directories. Base directory, where final asset files are stored and Spool directory for temp files
175 ;; These directories must be on the same physical filesystem
176 ;BaseDirectory = "./fsassets/data"
177 ;SpoolDirectory = "./fsassets/tmp"
178
179 ;; Original service can be checked if FSAssets can not find an asset
180 ;FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
181
182 ;; How many days since last updating the access time before its updated again by FSAssets when accessing an asset
183 ;; Reduces DB calls if asset is requested oftern. Default value 0
184 ;DaysBetweenAccessTimeUpdates = 30
185
186 ;; FSAssets Custom Database Config (Leave blank to use grids default database configuration)
187 ;StorageProvider = ""
188 ;ConnectionString = ""
189 ;Realm = "fsassets"
190
191 ;; The Following Are Common to both the default asset service and FSAsset service
192
193 ;; Default loader for loading default assets from XML on first run
174 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 194 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
175 AssetLoaderArgs = "./assets/AssetSets.xml" 195 AssetLoaderArgs = "./assets/AssetSets.xml"
176 196
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 @@
1[AssetService]
2
3 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 @@
1[AssetService]
2
3 LocalServiceModule = "OpenSim.Services.FSAssetService.dll:FSAssetConnector"
4
5 BaseDirectory = "./fsassets/data"
6 SpoolDirectory = "./fsassets/tmp"
7
8 ;; Original service can be checked if FSAssets can not find an asset
9 FallbackService = "OpenSim.Services.AssetService.dll:AssetService";
10
11 ;; How many days since last updating the access time before its updated again when accessing an asset
12 ;; Reduces DB calls if asset is requested oftern. Default value 0
13 ;DaysBetweenAccessTimeUpdates = 30
14
15 ;; Custom Database config (Leave blank to use grids default database configuration)
16 ;StorageProvider = ""
17 ;ConnectionString = ""
18 ;Realm = "fsassets" \ No newline at end of file