2 files changed, 86 insertions, 0 deletions

diff --git a/OpenSim/Framework/DynAttrsOSDMap.cs b/OpenSim/Framework/DynAttrsOSDMap.cs
new file mode 100644
index 0000000..2d45f66
--- /dev/null
+++ b/OpenSim/Framework/DynAttrsOSDMap.cs
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Framework
+{
+    /// <summary>
+    /// This is the map for storing and retrieving dynamic attributes.
+    /// </summary>
+    public class DynAttrsOSDMap : OSDMap, IXmlSerializable
+    {    
+        public XmlSchema GetSchema() { return null; } 
+
+        public static DynAttrsOSDMap FromXml(string rawXml)
+        {
+            DynAttrsOSDMap map = new DynAttrsOSDMap();
+            map.ReadXml(rawXml);
+            return map;
+        }
+        
+        public void ReadXml(string rawXml)
+        {            
+            //System.Console.WriteLine("Trying to deserialize [{0}]", rawXml);
+            
+            OSDMap map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);
+            
+            foreach (string key in map.Keys)
+                this[key] = map[key];            
+        }
+        
+        public void ReadXml(XmlReader reader)
+        { 
+            ReadXml(reader.ReadInnerXml());            
+        }
+        
+        public string ToXml()
+        {
+            return OSDParser.SerializeLLSDXmlString(this);
+        }
+
+        public void WriteXml(XmlWriter writer)
+        {
+            writer.WriteRaw(ToXml());
+        }                             
+    }
+}
\ No newline at end of file
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
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static readonly byte[] DEFAULT_TEXTURE = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")).GetBytes();
+        
+        /// <summary>
+        /// Dynamic attributes can be created and deleted as required.
+        /// </summary>
+        public DynAttrsOSDMap DynAttrs { get; set; }        
 
         private byte[] m_textureEntry;
 
@@ -194,6 +199,7 @@ namespace OpenSim.Framework
         {
             PCode = (byte)PCodeEnum.Primitive;
             m_textureEntry = DEFAULT_TEXTURE;
+            DynAttrs = new DynAttrsOSDMap();
         }
 
         /// <summary>
@@ -205,6 +211,7 @@ namespace OpenSim.Framework
 //            m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: Creating from {0}", prim.ID);
 
             PCode = (byte)prim.PrimData.PCode;
+            DynAttrs = new DynAttrsOSDMap();
 
             State = prim.PrimData.State;
             PathBegin = Primitive.PackBeginCut(prim.PrimData.PathBegin);