Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2016-12-23 02:53:58 +00:00
13 changed files with 600 additions and 197 deletions

View File

@@ -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;
}
}