Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it

This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-16 22:21:46 +01:00
parent a3e1e6dd61
commit a6d9c26365
8 changed files with 191 additions and 97 deletions

View File

@@ -128,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary>
/// Dynamic attributes can be created and deleted as required.
/// </summary>
public DynAttrsOSDMap DynAttrs { get; set; }
public DAMap DynAttrs { get; set; }
/// <value>
/// Is this a root part?
@@ -341,7 +341,7 @@ namespace OpenSim.Region.Framework.Scenes
m_particleSystem = Utils.EmptyBytes;
Rezzed = DateTime.UtcNow;
Description = String.Empty;
DynAttrs = new DynAttrsOSDMap();
DynAttrs = new DAMap();
// Prims currently only contain a single folder (Contents). From looking at the Second Life protocol,
// this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from