aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorTom Grimshaw2010-05-19 00:21:38 -0700
committerTom Grimshaw2010-05-19 00:21:38 -0700
commit71a95900fd19685974b6cdb024b44b71c2847d70 (patch)
treed0098be08c1b278bb7fa0c7f7f1c207443fd6ba9 /bin
parentFix a null reference issue in cmGetAvatarList() (diff)
parentAllow remote admin to be used on a different port from the main region port (diff)
downloadopensim-SC-71a95900fd19685974b6cdb024b44b71c2847d70.zip
opensim-SC-71a95900fd19685974b6cdb024b44b71c2847d70.tar.gz
opensim-SC-71a95900fd19685974b6cdb024b44b71c2847d70.tar.bz2
opensim-SC-71a95900fd19685974b6cdb024b44b71c2847d70.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6d5ee14..f318a2d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -594,6 +594,10 @@
594 594
595[RemoteAdmin] 595[RemoteAdmin]
596 enabled = false 596 enabled = false
597
598 ; Set this to a nonzero value to have remote admin use a different port
599 port = 0
600
597 access_password = unknown 601 access_password = unknown
598 602
599 ; set this variable to true if you want the create_region XmlRpc 603 ; set this variable to true if you want the create_region XmlRpc