diff options
| author | Melanie | 2011-10-12 07:09:10 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-12 07:09:10 +0100 |
| commit | 1c67c13d773b7d3daafd32066134604a5441d0b3 (patch) | |
| tree | eecd3e23f6ae375c7f98c40e1206101eb240241c | |
| parent | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge (diff) | |
| parent | Improve explanation of access_ip_addresses in [RemoteAdmin] to say that there... (diff) | |
| download | opensim-SC_OLD-1c67c13d773b7d3daafd32066134604a5441d0b3.zip opensim-SC_OLD-1c67c13d773b7d3daafd32066134604a5441d0b3.tar.gz opensim-SC_OLD-1c67c13d773b7d3daafd32066134604a5441d0b3.tar.bz2 opensim-SC_OLD-1c67c13d773b7d3daafd32066134604a5441d0b3.tar.xz | |
Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge
| -rw-r--r-- | bin/OpenSim.ini.example | 1 | ||||
| -rw-r--r-- | bin/OpenSimDefaults.ini | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index d7c3a64..44da31c 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -406,6 +406,7 @@ | |||
| 406 | ; access_password = "" | 406 | ; access_password = "" |
| 407 | 407 | ||
| 408 | ;# List the IP addresses allowed to call RemoteAdmin | 408 | ;# List the IP addresses allowed to call RemoteAdmin |
| 409 | ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin. | ||
| 409 | ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ... | 410 | ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ... |
| 410 | ; access_ip_addresses = | 411 | ; access_ip_addresses = |
| 411 | 412 | ||
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a2542da..8660f4f 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -803,6 +803,7 @@ | |||
| 803 | access_password = unknown | 803 | access_password = unknown |
| 804 | 804 | ||
| 805 | ; List the IP addresses allowed to call RemoteAdmin | 805 | ; List the IP addresses allowed to call RemoteAdmin |
| 806 | ; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin. | ||
| 806 | ; access_ip_addresses = 0.0.0.0, 0.0.0.0 ... | 807 | ; access_ip_addresses = 0.0.0.0, 0.0.0.0 ... |
| 807 | ; access_ip_addresses = | 808 | ; access_ip_addresses = |
| 808 | 809 | ||