aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-11-18 06:19:39 +0000
committerMelanie2009-11-18 06:19:39 +0000
commit0cd3bf074a9cc50d47e6e1873a9a5346453110ce (patch)
treed33b8efd2a882df0ef07231ac0703019449d82f4
parentCorrect formatting of Primitive.Textures in PrimitiveBaseShape.ToOmvPrimitive... (diff)
downloadopensim-SC_OLD-0cd3bf074a9cc50d47e6e1873a9a5346453110ce.zip
opensim-SC_OLD-0cd3bf074a9cc50d47e6e1873a9a5346453110ce.tar.gz
opensim-SC_OLD-0cd3bf074a9cc50d47e6e1873a9a5346453110ce.tar.bz2
opensim-SC_OLD-0cd3bf074a9cc50d47e6e1873a9a5346453110ce.tar.xz
Change PresenceData to PresenceInfo to remove a naming conflict in the
OpenSim.Data namespace
-rw-r--r--OpenSim/Data/IPresenceData.cs4
-rw-r--r--OpenSim/Services/Interfaces/IPresenceService.cs8
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs5
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
34{ 34{
35 public class PresenceData 35 public class PresenceData
36 { 36 {
37 public UUID PrincipalID; 37 public UUID UUID;
38 public UUID RegionID; 38 public UUID currentRegion;
39 public Dictionary<string, object> Data; 39 public Dictionary<string, object> Data;
40 } 40 }
41 41
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;
31 31
32namespace OpenSim.Services.Interfaces 32namespace OpenSim.Services.Interfaces
33{ 33{
34 public class PresenceInfo
35 {
36 public UUID PrincipalID;
37 public UUID RegionID;
38 public Dictionary<string, object> Data;
39 }
40
34 public interface IPresenceService 41 public interface IPresenceService
35 { 42 {
43 bool Report(PresenceInfo presence);
36 } 44 }
37} 45}
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
49 : base(config) 49 : base(config)
50 { 50 {
51 } 51 }
52
53 public bool Report(PresenceInfo presence)
54 {
55 return false;
56 }
52 } 57 }
53} 58}