diff options
author | Justin Clark-Casey (justincc) | 2010-08-16 20:38:20 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-25 04:03:04 +0000 |
commit | 1bd0b06ec1a0a5a7d6302d8017edcea7faf557e0 (patch) | |
tree | 71e12201d2d14b11ab1b0a9e7ed3905793ed9dff /OpenSim/Framework | |
parent | Disable json tests for now - I see this is failing on jenkins because mono 2.... (diff) | |
download | opensim-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')
-rw-r--r-- | OpenSim/Framework/DynAttrsOSDMap.cs | 79 | ||||
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 7 |
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 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.IO; | ||
31 | using System.Text; | ||
32 | using System.Xml; | ||
33 | using System.Xml.Schema; | ||
34 | using System.Xml.Serialization; | ||
35 | using OpenMetaverse; | ||
36 | using OpenMetaverse.StructuredData; | ||
37 | |||
38 | namespace OpenSim.Framework | ||
39 | { | ||
40 | /// <summary> | ||
41 | /// This is the map for storing and retrieving dynamic attributes. | ||
42 | /// </summary> | ||
43 | public class DynAttrsOSDMap : OSDMap, IXmlSerializable | ||
44 | { | ||
45 | public XmlSchema GetSchema() { return null; } | ||
46 | |||
47 | public static DynAttrsOSDMap FromXml(string rawXml) | ||
48 | { | ||
49 | DynAttrsOSDMap map = new DynAttrsOSDMap(); | ||
50 | map.ReadXml(rawXml); | ||
51 | return map; | ||
52 | } | ||
53 | |||
54 | public void ReadXml(string rawXml) | ||
55 | { | ||
56 | //System.Console.WriteLine("Trying to deserialize [{0}]", rawXml); | ||
57 | |||
58 | OSDMap map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml); | ||
59 | |||
60 | foreach (string key in map.Keys) | ||
61 | this[key] = map[key]; | ||
62 | } | ||
63 | |||
64 | public void ReadXml(XmlReader reader) | ||
65 | { | ||
66 | ReadXml(reader.ReadInnerXml()); | ||
67 | } | ||
68 | |||
69 | public string ToXml() | ||
70 | { | ||
71 | return OSDParser.SerializeLLSDXmlString(this); | ||
72 | } | ||
73 | |||
74 | public void WriteXml(XmlWriter writer) | ||
75 | { | ||
76 | writer.WriteRaw(ToXml()); | ||
77 | } | ||
78 | } | ||
79 | } \ 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 | |||
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); |