From 982e3ff5d927df498c1d14111e2c61f0251c09d4 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 27 Dec 2009 01:27:51 +0000
Subject: Presence Step 1

---
 OpenSim/Services/Interfaces/IPresenceService.cs     | 9 ++++++++-
 OpenSim/Services/PresenceService/PresenceService.cs | 7 ++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index aa1c5bf..4de57e3 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using OpenSim.Framework;
 using System.Collections.Generic;
 using OpenMetaverse;
@@ -35,7 +36,13 @@ namespace OpenSim.Services.Interfaces
     {
         public UUID PrincipalID;
         public UUID RegionID;
-        public Dictionary<string, string> Data;
+        public UUID SessionID;
+        public UUID SecureSessionID;
+        public bool Online;
+        public DateTime Login;
+        public DateTime Logout;
+        public Vector3 Position;
+        public Vector3 LookAt;
     }
 
     public interface IPresenceService
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index 2157462..04bcee6 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -55,11 +55,8 @@ namespace OpenSim.Services.PresenceService
             PresenceData p = new PresenceData();
             p.Data = new Dictionary<string, string>();
 
-            p.UUID = presence.PrincipalID;
-            p.currentRegion = presence.RegionID;
-
-            foreach (KeyValuePair<string, string> kvp in presence.Data)
-                p.Data[kvp.Key] = kvp.Value;
+            p.PrincipalID = presence.PrincipalID;
+            p.RegionID = presence.RegionID;
 
             return false;
         }
-- 
cgit v1.1