Merge branch 'SledjChisl'

1 files changed, 15 insertions, 6 deletions

diff --git a/OpenSim/Data/MySQL/MySQLPresenceData.cs b/OpenSim/Data/MySQL/MySQLPresenceData.cs
index 3f90639..b9114eb 100644
--- a/OpenSim/Data/MySQL/MySQLPresenceData.cs
+++ b/OpenSim/Data/MySQL/MySQLPresenceData.cs
@@ -52,8 +52,17 @@ namespace OpenSim.Data.MySQL
 
         public PresenceData Get(UUID sessionID)
         {
-            PresenceData[] ret = Get("SessionID",
-                    sessionID.ToString());
+            PresenceData[] ret = Get("SessionID", sessionID.ToString());
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public PresenceData GetByUser(UUID userID)
+        {
+            PresenceData[] ret = Get("UserID", userID.ToString());
 
             if (ret.Length == 0)
                 return null;
@@ -66,9 +75,9 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 cmd.CommandText = String.Format("delete from {0} where `RegionID`=?RegionID", m_Realm);
-    
+
                 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
+
                 ExecuteNonQuery(cmd);
             }
         }
@@ -85,10 +94,10 @@ namespace OpenSim.Data.MySQL
             using (MySqlCommand cmd = new MySqlCommand())
             {
                 cmd.CommandText = String.Format("update {0} set RegionID=?RegionID, LastSeen=NOW() where `SessionID`=?SessionID", m_Realm);
-    
+
                 cmd.Parameters.AddWithValue("?SessionID", sessionID.ToString());
                 cmd.Parameters.AddWithValue("?RegionID", regionID.ToString());
-    
+
                 if (ExecuteNonQuery(cmd) == 0)
                     return false;
             }