Delete existing presences for a user ID when they log in again.

WARNING!!! This changes a default. The old default is to allow multiple
presences, the new default disables this. As the feature currently has no users,
this should not present any difficulty and will alleviate the presence
issues somewhat.

2 files changed, 16 insertions, 0 deletions

diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 09c31c3..c8ac38e 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -45,10 +45,20 @@ namespace OpenSim.Services.PresenceService
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
+        protected bool m_allowDuplicatePresences = false;
+
         public PresenceService(IConfigSource config)
             : base(config)
         {
             m_log.Debug("[PRESENCE SERVICE]: Starting presence service");
+
+            IConfig presenceConfig = config.Configs["PresenceService"];
+            if (presenceConfig != null)
+            {
+                m_allowDuplicatePresences =
+                        presenceConfig.GetBoolean("AllowDuplicatePresences",
+                                                  m_allowDuplicatePresences);
+            }
         }
 
         public bool LoginAgent(string userID, UUID sessionID,
@@ -57,6 +67,9 @@ namespace OpenSim.Services.PresenceService
             //PresenceData[] d = m_Database.Get("UserID", userID);
             //m_Database.Get("UserID", userID);
 
+            if (!m_allowDuplicatePresences)
+                m_Database.Delete("UserID", userID.ToString());
+
             PresenceData data = new PresenceData();
 
             data.UserID = userID;
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