Merge branch 'master' into httptests

2 files changed, 2 insertions, 10 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 92904a8..146d538 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -295,8 +295,8 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
 
-    ; Realm = "regions"
-    ; AllowDuplicateNames = "True"
+    ; Realm = "regions"   
+    ; AllowDuplicateNames = ""
 
     ;; Perform distance check for the creation of a linked region
     ; Check4096 = "True"
@@ -452,10 +452,6 @@
     ; 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
     LocalServiceModule = "OpenSim.Services.AvatarService.dll:AvatarService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 2263780..fac5b60 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -398,10 +398,6 @@
 [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