Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 7 insertions, 5 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
index 5f495ae..0c71e79 100644
--- a/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLPresenceData.cs
@@ -100,16 +100,18 @@ namespace OpenSim.Data.MSSQL
             return true;
         }
 
-        public PresenceData VerifyAgent(UUID secureSessionID)
+        public bool VerifyAgent(UUID agentId, UUID secureSessionID)
         {
             PresenceData[] ret = Get("SecureSessionID",
                     secureSessionID.ToString());
-
+            
             if (ret.Length == 0)
-                return null;
+                return false;
 
-            return ret[0];
-        }
+            if(ret[0].UserID != agentId.ToString())
+                return false;
 
+            return true;
+        }
     }
 }