Change PresenceData to PresenceInfo to remove a naming conflict in the

OpenSim.Data namespace

3 files changed, 15 insertions, 2 deletions

diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs
index ca661a2..891b590 100644
--- a/OpenSim/Data/IPresenceData.cs
+++ b/OpenSim/Data/IPresenceData.cs
@@ -34,8 +34,8 @@ namespace OpenSim.Data
 {
     public class PresenceData
     {
-        public UUID PrincipalID;
-        public UUID RegionID;
+        public UUID UUID;
+        public UUID currentRegion;
         public Dictionary<string, object> Data;
     }
 
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index d33b6bc..6ceeb45 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -31,7 +31,15 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Interfaces
 {
+    public class PresenceInfo
+    {
+        public UUID PrincipalID;
+        public UUID RegionID;
+        public Dictionary<string, object> Data;
+    }
+
     public interface IPresenceService
     {
+        bool Report(PresenceInfo presence);
     }
 }
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index ba8eec8..8931a26 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -49,5 +49,10 @@ namespace OpenSim.Services.PresenceService
             : base(config)
         {
         }
+
+        public bool Report(PresenceInfo presence)
+        {
+            return false;
+        }
     }
 }