Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge

2 files changed, 8 insertions, 0 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d795952..d7c3a64 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -405,6 +405,10 @@
     ;; the "password" parameter)
     ; access_password = ""
 
+    ;# List the IP addresses allowed to call RemoteAdmin
+    ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ...
+    ; access_ip_addresses =
+
     ;# {create_region_enable_voice} {enabled:true} {Enable voice for newly created regions?} {true false} false
     ;; set this variable to true if you want the create_region XmlRpc
     ;; call to unconditionally enable voice on all parcels for a newly
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c4f5592..a2542da 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -802,6 +802,10 @@
     ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
     access_password = unknown
 
+    ; List the IP addresses allowed to call RemoteAdmin
+    ; access_ip_addresses = 0.0.0.0, 0.0.0.0 ...
+    ; access_ip_addresses =
+
     ; set this variable to true if you want the create_region XmlRpc
     ; call to unconditionally enable voice on all parcels for a newly
     ; created region [default: false]