aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-16 22:21:46 +0100
committerJustin Clark-Casey (justincc)2013-01-25 04:03:11 +0000
commita6d9c263650cc23d60f941718f87a64aa2f360b2 (patch)
tree29bdd5df7bae66360e19a38c304e7197b6a55342 /OpenSim/Region/Framework
parentImplement dynamic attribute persistence on mysql and mssql (diff)
downloadopensim-SC_OLD-a6d9c263650cc23d60f941718f87a64aa2f360b2.zip
opensim-SC_OLD-a6d9c263650cc23d60f941718f87a64aa2f360b2.tar.gz
opensim-SC_OLD-a6d9c263650cc23d60f941718f87a64aa2f360b2.tar.bz2
opensim-SC_OLD-a6d9c263650cc23d60f941718f87a64aa2f360b2.tar.xz
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
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2a9b99e..27f3a4d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes
128 /// <summary> 128 /// <summary>
129 /// Dynamic attributes can be created and deleted as required. 129 /// Dynamic attributes can be created and deleted as required.
130 /// </summary> 130 /// </summary>
131 public DynAttrsOSDMap DynAttrs { get; set; } 131 public DAMap DynAttrs { get; set; }
132 132
133 /// <value> 133 /// <value>
134 /// Is this a root part? 134 /// Is this a root part?
@@ -341,7 +341,7 @@ namespace OpenSim.Region.Framework.Scenes
341 m_particleSystem = Utils.EmptyBytes; 341 m_particleSystem = Utils.EmptyBytes;
342 Rezzed = DateTime.UtcNow; 342 Rezzed = DateTime.UtcNow;
343 Description = String.Empty; 343 Description = String.Empty;
344 DynAttrs = new DynAttrsOSDMap(); 344 DynAttrs = new DAMap();
345 345
346 // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, 346 // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol,
347 // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from 347 // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from