Merge branch 'master' into careminster-presence-refactor

1 files changed, 13 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;