Merge branch 'master' into careminster-presence-refactor

1 files changed, 2 insertions, 28 deletions

diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index b4c1859..abbae2c 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -55,23 +55,6 @@ namespace OpenSim.Services.Interfaces
                 UserID = kvp["UserID"].ToString();
             if (kvp.ContainsKey("RegionID"))
                 UUID.TryParse(kvp["RegionID"].ToString(), out RegionID);
-            if (kvp.ContainsKey("login"))
-                DateTime.TryParse(kvp["login"].ToString(), out Login);
-            if (kvp.ContainsKey("logout"))
-                DateTime.TryParse(kvp["logout"].ToString(), out Logout);
-            if (kvp.ContainsKey("lookAt"))
-                Vector3.TryParse(kvp["lookAt"].ToString(), out LookAt);
-            if (kvp.ContainsKey("online"))
-                Boolean.TryParse(kvp["online"].ToString(), out Online);
-            if (kvp.ContainsKey("position"))
-                Vector3.TryParse(kvp["position"].ToString(), out Position);
-            if (kvp.ContainsKey("HomeRegionID"))
-                UUID.TryParse(kvp["HomeRegionID"].ToString(), out HomeRegionID);
-            if (kvp.ContainsKey("HomePosition"))
-                Vector3.TryParse(kvp["HomePosition"].ToString(), out HomePosition);
-            if (kvp.ContainsKey("HomeLookAt"))
-                Vector3.TryParse(kvp["HomeLookAt"].ToString(), out HomeLookAt);
-
         }
 
         public Dictionary<string, object> ToKeyValuePairs()
@@ -79,14 +62,6 @@ namespace OpenSim.Services.Interfaces
             Dictionary<string, object> result = new Dictionary<string, object>();
             result["UserID"] = UserID;
             result["RegionID"] = RegionID.ToString();
-            result["online"] = Online.ToString();
-            result["login"] = Login.ToString();
-            result["logout"] = Logout.ToString();
-            result["position"] = Position.ToString();
-            result["lookAt"] = LookAt.ToString();
-            result["HomeRegionID"] = HomeRegionID.ToString();
-            result["HomePosition"] = HomePosition.ToString();
-            result["HomeLookAt"] = HomeLookAt.ToString();
 
             return result;
         }
@@ -115,11 +90,10 @@ namespace OpenSim.Services.Interfaces
     public interface IPresenceService
     {
         bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID);
-        bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookAt);
+        bool LogoutAgent(UUID sessionID);
         bool LogoutRegionAgents(UUID regionID);
 
-        bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt);
-        bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt);
+        bool ReportAgent(UUID sessionID, UUID regionID);
 
         PresenceInfo GetAgent(UUID sessionID);
         PresenceInfo[] GetAgents(string[] userIDs);