aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-11-03 01:09:42 +0000
committerMelanie2010-11-03 01:09:42 +0000
commitc285f87702bb087f72ccbc7340bf82bde81e22a5 (patch)
tree4cd0bd41949b67df57f1b6bfacd50444aa45fb30
parentAdmin Server can now bind to a private ip address (diff)
downloadopensim-SC-c285f87702bb087f72ccbc7340bf82bde81e22a5.zip
opensim-SC-c285f87702bb087f72ccbc7340bf82bde81e22a5.tar.gz
opensim-SC-c285f87702bb087f72ccbc7340bf82bde81e22a5.tar.bz2
opensim-SC-c285f87702bb087f72ccbc7340bf82bde81e22a5.tar.xz
Fix config items. Less used / expert items go in OpenSimDefaults.ini
The default shown is always the hardcoded default
-rw-r--r--bin/OpenSim.ini.example3
-rw-r--r--bin/OpenSimDefaults.ini3
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 669f534..9d34854 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -326,9 +326,6 @@
326 ;; Set this to a nonzero value to have remote admin use a different port 326 ;; Set this to a nonzero value to have remote admin use a different port
327 ; port = 0 327 ; port = 0
328 328
329 ;; Set this to the ip address that you want the admin server to bind to
330 ; bind_ip_address = 127.0.0.1
331
332 ;# {access_password} {enabled:true} {Password for the remote admin interface} {} 329 ;# {access_password} {enabled:true} {Password for the remote admin interface} {}
333 ;; This password is required to make any XMLRPC call (should be set as 330 ;; This password is required to make any XMLRPC call (should be set as
334 ;; the "password" parameter) 331 ;; the "password" parameter)
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index de7c44c..f98689b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -624,6 +624,9 @@
624 ; Set this to a nonzero value to have remote admin use a different port 624 ; Set this to a nonzero value to have remote admin use a different port
625 port = 0 625 port = 0
626 626
627 ; Set this to the ip address that you want the admin server to bind to
628 bind_ip_address = "0.0.0.0"
629
627 ; This password is required to make any XMLRPC call (should be set as the "password" parameter) 630 ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
628 access_password = unknown 631 access_password = unknown
629 632