Merge branch 'master' into httptests

1 files changed, 14 insertions, 0 deletions

diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
index 98ab651..6d46fe9 100644
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -27,6 +27,8 @@
 
 using System;
 using OpenMetaverse;
+using System.Collections.Generic;
+
 
 namespace OpenSim.Framework
 {
@@ -122,5 +124,17 @@ namespace OpenSim.Framework
         public string UserId = UUID.Zero.ToString();
         public string DataVal = string.Empty;
     }
+
+    public class UserProfileCacheEntry
+    {
+        public Dictionary<UUID, string> picksList;
+        public Dictionary<UUID, UserProfilePick> picks;
+        public Dictionary<UUID, string> classifiedsLists;
+        public Dictionary<UUID, UserClassifiedAdd> classifieds;
+        public UserProfileProperties props;
+        public string born;
+        public byte[] membershipType;
+        public uint flags;
+    }
 }