Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs

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
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
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
         ; Set this if you want to change the default
         ; TilesStoragePath = "maptiles"
+        ;
+        ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002),
+        ; you may want to set this. Otherwise, don't set it, because it's already protected.
+        ; GridService = "OpenSim.Services.GridService.dll:GridService"
+        ;
+    ; Additionally, if you run this server behind a proxy, set this to true
+    ; HasProxy = false
 
 [GridInfoService]
     ; 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
     LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
         ; Set this if you want to change the default
         ; TilesStoragePath = "maptiles"
+        ;
+        ; If for some reason you have the AddMapTile service outside the firewall (e.g. 8002),
+        ; you may want to set this. Otherwise, don't set it, because it's already protected.
+        ; GridService = "OpenSim.Services.GridService.dll:GridService"
+        ;
+    ; Additionally, if you run this server behind a proxy, set this to true
+    ; HasProxy = false
+
 
 
 [GridInfoService]