From 0cd3bf074a9cc50d47e6e1873a9a5346453110ce Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 18 Nov 2009 06:19:39 +0000 Subject: Change PresenceData to PresenceInfo to remove a naming conflict in the OpenSim.Data namespace --- OpenSim/Data/IPresenceData.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Data/IPresenceData.cs') 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 Data; } -- cgit v1.1 From 06ecdf1967848e3f0c6b6f98aba61c7ad099f65d Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 18 Nov 2009 08:21:28 +0000 Subject: Tweak presence handling and whip up a database connector and handler for testign the new generic table handling --- OpenSim/Data/IPresenceData.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Data/IPresenceData.cs') diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs index 891b590..020ba5d 100644 --- a/OpenSim/Data/IPresenceData.cs +++ b/OpenSim/Data/IPresenceData.cs @@ -32,11 +32,11 @@ using OpenSim.Framework; namespace OpenSim.Data { - public class PresenceData + public struct PresenceData { public UUID UUID; public UUID currentRegion; - public Dictionary Data; + public Dictionary Data; } /// -- cgit v1.1 From 23438e66e7ee3cd71652cdf6fd6a801544179ec0 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 18 Nov 2009 08:53:07 +0000 Subject: Implement generic delete method --- OpenSim/Data/IPresenceData.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'OpenSim/Data/IPresenceData.cs') diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs index 020ba5d..e5a8ebd 100644 --- a/OpenSim/Data/IPresenceData.cs +++ b/OpenSim/Data/IPresenceData.cs @@ -48,7 +48,8 @@ namespace OpenSim.Data PresenceData Get(UUID principalID); - bool SetDataItem(UUID principalID, string item, string value); + bool SetUserDataItem(UUID principalID, string item, string value); + bool SetRegionDataItem(UUID principalID, string item, string value); bool Delete(UUID regionID); } -- cgit v1.1