diff options
| author | Justin Clark-Casey (justincc) | 2013-02-07 02:19:53 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-07 02:19:53 +0000 |
| commit | 2c5d24d39473d3552ece36c97243ae070d10d26b (patch) | |
| tree | d9d46e26e888b806ad7a1c7d6fb09bff637c13d1 /OpenSim/Framework/DAMap.cs | |
| parent | Add TestJsonWriteReadNotecard() regression test (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2c5d24d39473d3552ece36c97243ae070d10d26b.zip opensim-SC_OLD-2c5d24d39473d3552ece36c97243ae070d10d26b.tar.gz opensim-SC_OLD-2c5d24d39473d3552ece36c97243ae070d10d26b.tar.bz2 opensim-SC_OLD-2c5d24d39473d3552ece36c97243ae070d10d26b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/DAMap.cs')
| -rw-r--r-- | OpenSim/Framework/DAMap.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs index 24e0895..64cea77 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()); |