aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/DAMap.cs
diff options
context:
space:
mode:
authorMic Bowman2013-02-06 17:29:17 -0800
committerMic Bowman2013-02-06 17:29:17 -0800
commite17392acbb46e1e48e169069a822f8b814762214 (patch)
treec14427ae1cd4c294addbe220e8916d4b9e068e3d /OpenSim/Framework/DAMap.cs
parentBulletSim: remove an exception which occurs if a physics mesh (diff)
downloadopensim-SC-e17392acbb46e1e48e169069a822f8b814762214.zip
opensim-SC-e17392acbb46e1e48e169069a822f8b814762214.tar.gz
opensim-SC-e17392acbb46e1e48e169069a822f8b814762214.tar.bz2
opensim-SC-e17392acbb46e1e48e169069a822f8b814762214.tar.xz
Enables script access to the per object dynamic attributes through the JsonStore
script functions. Adds JsonAttachObjectStore to associate a store identifier with an object (scripts can only access the store in their host object, this could be extended but isn't necessary for now). Note this opens a method to the DAMap OSDMap. This will be removed later, but greatly simplifies the code for now. The JsonStore and these scripts are disabled by default.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/DAMap.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index 291c8b8..7d7738a 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -73,6 +73,14 @@ namespace OpenSim.Framework
73 m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml); 73 m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);
74 } 74 }
75 75
76 // WARNING: this is temporary for experimentation only, it will be removed!!!!
77 public OSDMap TopLevelMap
78 {
79 get { return m_map; }
80 set { m_map = value; }
81 }
82
83
76 public void ReadXml(XmlReader reader) 84 public void ReadXml(XmlReader reader)
77 { 85 {
78 ReadXml(reader.ReadInnerXml()); 86 ReadXml(reader.ReadInnerXml());