diff options
Diffstat (limited to '')
3 files changed, 24 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs index 9b504c0..2a5828e 100644 --- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs | |||
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | [assembly: AssemblyVersion("0.7.5.*")] | 32 | [assembly: AssemblyVersion("0.7.6.*")] |
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | [assembly: AssemblyFileVersion("1.0.0.0")] |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f037348..79779a8 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -37,6 +37,7 @@ using System.Xml.Serialization; | |||
37 | using log4net; | 37 | using log4net; |
38 | using OpenMetaverse; | 38 | using OpenMetaverse; |
39 | using OpenMetaverse.Packets; | 39 | using OpenMetaverse.Packets; |
40 | using OpenMetaverse.StructuredData; | ||
40 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
41 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Framework.Scenes.Scripting; | 43 | using OpenSim.Region.Framework.Scenes.Scripting; |
@@ -136,6 +137,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
136 | 137 | ||
137 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 138 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
138 | 139 | ||
140 | /// <summary> | ||
141 | /// Dynamic attributes can be created and deleted as required. | ||
142 | /// </summary> | ||
143 | public DAMap DynAttrs { get; set; } | ||
144 | |||
139 | /// <value> | 145 | /// <value> |
140 | /// Is this a root part? | 146 | /// Is this a root part? |
141 | /// </value> | 147 | /// </value> |
@@ -386,6 +392,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
386 | m_particleSystem = Utils.EmptyBytes; | 392 | m_particleSystem = Utils.EmptyBytes; |
387 | Rezzed = DateTime.UtcNow; | 393 | Rezzed = DateTime.UtcNow; |
388 | Description = String.Empty; | 394 | Description = String.Empty; |
395 | DynAttrs = new DAMap(); | ||
389 | 396 | ||
390 | // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, | 397 | // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, |
391 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from | 398 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from |
@@ -2118,6 +2125,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2118 | // safeguard actual copy is done in sog.copy | 2125 | // safeguard actual copy is done in sog.copy |
2119 | dupe.KeyframeMotion = null; | 2126 | dupe.KeyframeMotion = null; |
2120 | 2127 | ||
2128 | dupe.DynAttrs.CopyFrom(DynAttrs); | ||
2129 | |||
2121 | if (userExposed) | 2130 | if (userExposed) |
2122 | { | 2131 | { |
2123 | /* | 2132 | /* |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 123c158..5c37c07 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -365,6 +365,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
365 | m_SOPXmlProcessors.Add("CollisionSound", ProcessCollisionSound); | 365 | m_SOPXmlProcessors.Add("CollisionSound", ProcessCollisionSound); |
366 | m_SOPXmlProcessors.Add("CollisionSoundVolume", ProcessCollisionSoundVolume); | 366 | m_SOPXmlProcessors.Add("CollisionSoundVolume", ProcessCollisionSoundVolume); |
367 | m_SOPXmlProcessors.Add("MediaUrl", ProcessMediaUrl); | 367 | m_SOPXmlProcessors.Add("MediaUrl", ProcessMediaUrl); |
368 | m_SOPXmlProcessors.Add("DynAttrs", ProcessDynAttrs); | ||
368 | m_SOPXmlProcessors.Add("TextureAnimation", ProcessTextureAnimation); | 369 | m_SOPXmlProcessors.Add("TextureAnimation", ProcessTextureAnimation); |
369 | m_SOPXmlProcessors.Add("ParticleSystem", ProcessParticleSystem); | 370 | m_SOPXmlProcessors.Add("ParticleSystem", ProcessParticleSystem); |
370 | m_SOPXmlProcessors.Add("PayPrice0", ProcessPayPrice0); | 371 | m_SOPXmlProcessors.Add("PayPrice0", ProcessPayPrice0); |
@@ -797,6 +798,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
797 | obj.MediaUrl = reader.ReadElementContentAsString("MediaUrl", String.Empty); | 798 | obj.MediaUrl = reader.ReadElementContentAsString("MediaUrl", String.Empty); |
798 | } | 799 | } |
799 | 800 | ||
801 | private static void ProcessDynAttrs(SceneObjectPart obj, XmlTextReader reader) | ||
802 | { | ||
803 | obj.DynAttrs.ReadXml(reader); | ||
804 | } | ||
805 | |||
800 | private static void ProcessTextureAnimation(SceneObjectPart obj, XmlTextReader reader) | 806 | private static void ProcessTextureAnimation(SceneObjectPart obj, XmlTextReader reader) |
801 | { | 807 | { |
802 | obj.TextureAnimation = Convert.FromBase64String(reader.ReadElementContentAsString("TextureAnimation", String.Empty)); | 808 | obj.TextureAnimation = Convert.FromBase64String(reader.ReadElementContentAsString("TextureAnimation", String.Empty)); |
@@ -1339,6 +1345,14 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1339 | writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString()); | 1345 | writer.WriteElementString("CollisionSoundVolume", sop.CollisionSoundVolume.ToString()); |
1340 | if (sop.MediaUrl != null) | 1346 | if (sop.MediaUrl != null) |
1341 | writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString()); | 1347 | writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString()); |
1348 | |||
1349 | if (sop.DynAttrs.Count > 0) | ||
1350 | { | ||
1351 | writer.WriteStartElement("DynAttrs"); | ||
1352 | sop.DynAttrs.WriteXml(writer); | ||
1353 | writer.WriteEndElement(); | ||
1354 | } | ||
1355 | |||
1342 | WriteBytes(writer, "TextureAnimation", sop.TextureAnimation); | 1356 | WriteBytes(writer, "TextureAnimation", sop.TextureAnimation); |
1343 | WriteBytes(writer, "ParticleSystem", sop.ParticleSystem); | 1357 | WriteBytes(writer, "ParticleSystem", sop.ParticleSystem); |
1344 | writer.WriteElementString("PayPrice0", sop.PayPrice[0].ToString()); | 1358 | writer.WriteElementString("PayPrice0", sop.PayPrice[0].ToString()); |