aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/PrimitiveBaseShape.cs
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/Framework/PrimitiveBaseShape.cs
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/Framework/PrimitiveBaseShape.cs')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index fb0255b..775412b 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Framework
86 /// <summary> 86 /// <summary>
87 /// Dynamic attributes can be created and deleted as required. 87 /// Dynamic attributes can be created and deleted as required.
88 /// </summary> 88 /// </summary>
89 public DynAttrsOSDMap DynAttrs { get; set; } 89 public DAMap DynAttrs { get; set; }
90 90
91 private byte[] m_textureEntry; 91 private byte[] m_textureEntry;
92 92
@@ -199,7 +199,7 @@ namespace OpenSim.Framework
199 { 199 {
200 PCode = (byte)PCodeEnum.Primitive; 200 PCode = (byte)PCodeEnum.Primitive;
201 m_textureEntry = DEFAULT_TEXTURE; 201 m_textureEntry = DEFAULT_TEXTURE;
202 DynAttrs = new DynAttrsOSDMap(); 202 DynAttrs = new DAMap();
203 } 203 }
204 204
205 /// <summary> 205 /// <summary>
@@ -211,7 +211,7 @@ namespace OpenSim.Framework
211// m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID); 211// m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID);
212 212
213 PCode = (byte)prim.PrimData.PCode; 213 PCode = (byte)prim.PrimData.PCode;
214 DynAttrs = new DynAttrsOSDMap(); 214 DynAttrs = new DAMap();
215 215
216 State = prim.PrimData.State; 216 State = prim.PrimData.State;
217 PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin); 217 PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);