Merge git://github.com/opensim/opensim into mantis5110

2 files changed, 6 insertions, 0 deletions

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 @@
     ; Set this to a nonzero value to have remote admin use a different port
     port = 0
 
+    ; Set this to the ip address that you want the admin server to bind to
+    bind_ip_address = "0.0.0.0"
+
     ; This password is required to make any XMLRPC call (should be set as the "password" parameter)
     access_password = unknown
 
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 10edccd..bc87ac2 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -107,6 +107,9 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [PresenceService]
     ; for the server connector
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    ; Set this to true to allow the use of advanced web services and multiple
+    ; bots using one account
+    AllowDuplicatePresences = false;
 
 [AvatarService]
     ; for the server connector