diff options
author | Melanie | 2012-04-27 22:28:09 +0100 |
---|---|---|
committer | Melanie | 2012-04-27 22:28:09 +0100 |
commit | dcbcbd697f70d361b63d502512d2731e0ee6e046 (patch) | |
tree | 8168b0dc214e9cb710b0972d5f03a7da3164189b /bin | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix prebuild.xml (diff) | |
download | opensim-SC-dcbcbd697f70d361b63d502512d2731e0ee6e046.zip opensim-SC-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.gz opensim-SC-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.bz2 opensim-SC-dcbcbd697f70d361b63d502512d2731e0ee6e046.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
Diffstat (limited to '')
-rw-r--r-- | bin/Ionic.Zip.dll | bin | 0 -> 462336 bytes | |||
-rw-r--r-- | bin/Robust.HG.ini.example | 7 | ||||
-rw-r--r-- | bin/Robust.ini.example | 8 |
3 files changed, 15 insertions, 0 deletions
diff --git a/bin/Ionic.Zip.dll b/bin/Ionic.Zip.dll new file mode 100644 index 0000000..95fa928 --- /dev/null +++ b/bin/Ionic.Zip.dll | |||
Binary files differ | |||
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 4ea5ffd..be75407 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example | |||
@@ -279,6 +279,13 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
279 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | 279 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" |
280 | ; Set this if you want to change the default | 280 | ; Set this if you want to change the default |
281 | ; TilesStoragePath = "maptiles" | 281 | ; TilesStoragePath = "maptiles" |
282 | ; | ||
283 | ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002), | ||
284 | ; you may want to set this. Otherwise, don't set it, because it's already protected. | ||
285 | ; GridService = "OpenSim.Services.GridService.dll:GridService" | ||
286 | ; | ||
287 | ; Additionally, if you run this server behind a proxy, set this to true | ||
288 | ; HasProxy = false | ||
282 | 289 | ||
283 | [GridInfoService] | 290 | [GridInfoService] |
284 | ; These settings are used to return information on a get_grid_info call. | 291 | ; 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 69e94a5..582af27 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example | |||
@@ -254,6 +254,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 | |||
254 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | 254 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" |
255 | ; Set this if you want to change the default | 255 | ; Set this if you want to change the default |
256 | ; TilesStoragePath = "maptiles" | 256 | ; TilesStoragePath = "maptiles" |
257 | ; | ||
258 | ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002), | ||
259 | ; you may want to set this. Otherwise, don't set it, because it's already protected. | ||
260 | ; GridService = "OpenSim.Services.GridService.dll:GridService" | ||
261 | ; | ||
262 | ; Additionally, if you run this server behind a proxy, set this to true | ||
263 | ; HasProxy = false | ||
264 | |||
257 | 265 | ||
258 | 266 | ||
259 | [GridInfoService] | 267 | [GridInfoService] |