diff options
author | Melanie Thielker | 2016-12-22 15:39:49 +0000 |
---|---|---|
committer | Melanie Thielker | 2016-12-22 15:39:49 +0000 |
commit | c3e8406f413fc6db8141bc9b1e2fb94cda92e79c (patch) | |
tree | 805011a6aa5a2825fdcb6a32321dfbf4472bc81f /OpenSim/Framework/UserProfiles.cs | |
parent | Update the ini examples to add options missing from one to the other. (diff) | |
parent | UserProfileModule refuse changes to classifieds outside home grid ( viewers m... (diff) | |
download | opensim-SC-c3e8406f413fc6db8141bc9b1e2fb94cda92e79c.zip opensim-SC-c3e8406f413fc6db8141bc9b1e2fb94cda92e79c.tar.gz opensim-SC-c3e8406f413fc6db8141bc9b1e2fb94cda92e79c.tar.bz2 opensim-SC-c3e8406f413fc6db8141bc9b1e2fb94cda92e79c.tar.xz |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/UserProfiles.cs')
-rw-r--r-- | OpenSim/Framework/UserProfiles.cs | 14 |
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 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using System.Collections.Generic; | ||
31 | |||
30 | 32 | ||
31 | namespace OpenSim.Framework | 33 | namespace OpenSim.Framework |
32 | { | 34 | { |
@@ -122,5 +124,17 @@ namespace OpenSim.Framework | |||
122 | public string UserId = UUID.Zero.ToString(); | 124 | public string UserId = UUID.Zero.ToString(); |
123 | public string DataVal = string.Empty; | 125 | public string DataVal = string.Empty; |
124 | } | 126 | } |
127 | |||
128 | public class UserProfileCacheEntry | ||
129 | { | ||
130 | public Dictionary<UUID, string> picksList; | ||
131 | public Dictionary<UUID, UserProfilePick> picks; | ||
132 | public Dictionary<UUID, string> classifiedsLists; | ||
133 | public Dictionary<UUID, UserClassifiedAdd> classifieds; | ||
134 | public UserProfileProperties props; | ||
135 | public string born; | ||
136 | public byte[] membershipType; | ||
137 | public uint flags; | ||
138 | } | ||
125 | } | 139 | } |
126 | 140 | ||