aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/PrimitiveBaseShape.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-08-16 20:38:20 +0100
committerJustin Clark-Casey (justincc)2013-01-25 04:03:04 +0000
commit1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0 (patch)
tree71e12201d2d14b11ab1b0a9e7ed3905793ed9dff /OpenSim/Framework/PrimitiveBaseShape.cs
parentDisable json tests for now - I see this is failing on jenkins because mono 2.... (diff)
downloadopensim-SC_OLD-1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0.zip
opensim-SC_OLD-1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0.tar.gz
opensim-SC_OLD-1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0.tar.bz2
opensim-SC_OLD-1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0.tar.xz
Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite
Diffstat (limited to 'OpenSim/Framework/PrimitiveBaseShape.cs')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 4c36819..fb0255b 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -82,6 +82,11 @@ namespace OpenSim.Framework
82 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 82 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
83 83
84 private static readonly byte[] DEFAULT_TEXTURE = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")).GetBytes(); 84 private static readonly byte[] DEFAULT_TEXTURE = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")).GetBytes();
85
86 /// <summary>
87 /// Dynamic attributes can be created and deleted as required.
88 /// </summary>
89 public DynAttrsOSDMap DynAttrs { get; set; }
85 90
86 private byte[] m_textureEntry; 91 private byte[] m_textureEntry;
87 92
@@ -194,6 +199,7 @@ namespace OpenSim.Framework
194 { 199 {
195 PCode = (byte)PCodeEnum.Primitive; 200 PCode = (byte)PCodeEnum.Primitive;
196 m_textureEntry = DEFAULT_TEXTURE; 201 m_textureEntry = DEFAULT_TEXTURE;
202 DynAttrs = new DynAttrsOSDMap();
197 } 203 }
198 204
199 /// <summary> 205 /// <summary>
@@ -205,6 +211,7 @@ namespace OpenSim.Framework
205// m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID); 211// m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID);
206 212
207 PCode = (byte)prim.PrimData.PCode; 213 PCode = (byte)prim.PrimData.PCode;
214 DynAttrs = new DynAttrsOSDMap();
208 215
209 State = prim.PrimData.State; 216 State = prim.PrimData.State;
210 PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin); 217 PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);