aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMic Bowman2011-06-15 11:24:29 -0700
committerMic Bowman2011-06-15 11:24:29 -0700
commit289c8fe1bc195b9d2c9094559099164c7934c963 (patch)
tree4234eb3b221391f041df27fa1428ee07b7cb49cf
parentAdded an expiring cache for region information to the (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-289c8fe1bc195b9d2c9094559099164c7934c963.zip
opensim-SC_OLD-289c8fe1bc195b9d2c9094559099164c7934c963.tar.gz
opensim-SC_OLD-289c8fe1bc195b9d2c9094559099164c7934c963.tar.bz2
opensim-SC_OLD-289c8fe1bc195b9d2c9094559099164c7934c963.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--bin/Robust.HG.ini.example2
-rw-r--r--bin/Robust.ini.example3
-rw-r--r--bin/config-include/StandaloneCommon.ini.example4
3 files changed, 9 insertions, 0 deletions
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 00ece88..ea271b8 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -242,6 +242,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
242 242
243[MapImageService] 243[MapImageService]
244 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 244 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
245 ; Set this if you want to change the default
246 ; TilesStoragePath = "maptiles"
245 247
246[GridInfoService] 248[GridInfoService]
247 ; These settings are used to return information on a get_grid_info call. 249 ; These settings are used to return information on a get_grid_info call.
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index e29e9db..14f79aa 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -216,6 +216,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
216 216
217[MapImageService] 217[MapImageService]
218 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" 218 LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
219 ; Set this if you want to change the default
220 ; TilesStoragePath = "maptiles"
221
219 222
220[GridInfoService] 223[GridInfoService]
221 ; These settings are used to return information on a get_grid_info call. 224 ; These settings are used to return information on a get_grid_info call.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 29c2af1..cbe3fa0 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -223,3 +223,7 @@
223 ; password help: optional: page providing password assistance for users of your grid 223 ; password help: optional: page providing password assistance for users of your grid
224 ; currently unused 224 ; currently unused
225 ;password = http://127.0.0.1/password 225 ;password = http://127.0.0.1/password
226
227[MapImageService]
228 ; Set this if you want to change the default
229 ; TilesStoragePath = "maptiles"