Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim

1 files changed, 6 insertions, 5 deletions

diff --git a/OpenSim/Data/IPresenceData.cs b/OpenSim/Data/IPresenceData.cs
index ca661a2..e5a8ebd 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 PrincipalID;
-        public UUID RegionID;
-        public Dictionary<string, object> Data;
+        public UUID UUID;
+        public UUID currentRegion;
+        public Dictionary<string, string> Data;
     }
 
     /// <summary>
@@ -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);
     }