Plumb in the presence notifications and region shutdown/restart messages

from the presence module to the message server, through the user server
and on into the database. This should fix the "Already logged in" issue
that grids see after a sim crashes, or a user crashes out of a sim.
Not yet a 100% solution for friends, but getting there.

5 files changed, 40 insertions, 0 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index 0afe47c..5185659 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -732,6 +732,10 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
+        override public void LogoutUsers(UUID regionID)
+        {
+        }
+
         #endregion
 
         #region Other public methods
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 288ca86..f203a66 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -891,5 +891,31 @@ namespace OpenSim.Data.MySQL
                 dbm.Release();
             }
         }
+
+        public override void LogoutUsers(UUID regionID)
+        {
+            Dictionary<string, string> param = new Dictionary<string, string>();
+            param["?regionID"] = regionID.ToString();
+
+            MySQLSuperManager dbm = GetLockedConnection("LogoutUsers");
+
+            try
+            {
+               dbm.Manager.ExecuteParameterizedSql(
+                        "update " + m_agentsTableName + " SET agentOnline = 0 " +
+                        "where currentRegion = ?regionID",
+                        param);
+            }
+            catch (Exception e)
+            {
+                dbm.Manager.Reconnect();
+                m_log.Error(e.ToString());
+                return;
+            }
+            finally
+            {
+                dbm.Release();
+            }
+        }
     }
 }
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 5ef48c8..1bb2b14 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -308,6 +308,10 @@ namespace OpenSim.Data.NHibernate
         {
         }
 
+        public override void LogoutUsers(UUID regionID)
+        {
+        }
+
         public override string Name {
             get { return "NHibernate"; }
         }
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 369fc51..b8f1a68 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -1037,5 +1037,9 @@ namespace OpenSim.Data.SQLite
         override public void ResetAttachments(UUID userID)
         {
         }
+
+        override public void LogoutUsers(UUID regionID)
+        {
+        }
     }
 }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index a5fc8c8..c1b320b 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -75,6 +75,8 @@ namespace OpenSim.Data
         // }
         public abstract void ResetAttachments(UUID userID);
 
+        public abstract void LogoutUsers(UUID regionID);
+
         public abstract string Version {get;}
         public abstract string Name {get;}
         public abstract void Initialise(string connect);