diff options
Diffstat (limited to 'OpenSim/Framework/DAMap.cs')
-rw-r--r-- | OpenSim/Framework/DAMap.cs | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs index 291c8b8..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()); |
@@ -168,6 +176,10 @@ namespace OpenSim.Framework | |||
168 | } | 176 | } |
169 | } | 177 | } |
170 | 178 | ||
179 | /// <summary> | ||
180 | /// Validate the key used for storing separate data stores. | ||
181 | /// </summary> | ||
182 | /// <param name='key'></param> | ||
171 | private static void ValidateKey(string key) | 183 | private static void ValidateKey(string key) |
172 | { | 184 | { |
173 | if (key.Length < MIN_STORE_NAME_LENGTH) | 185 | if (key.Length < MIN_STORE_NAME_LENGTH) |
@@ -188,7 +200,8 @@ namespace OpenSim.Framework | |||
188 | } | 200 | } |
189 | 201 | ||
190 | public void Add(KeyValuePair<string, OSDMap> kvp) | 202 | public void Add(KeyValuePair<string, OSDMap> kvp) |
191 | { | 203 | { |
204 | ValidateKey(kvp.Key); | ||
192 | lock (this) | 205 | lock (this) |
193 | m_map.Add(kvp.Key, kvp.Value); | 206 | m_map.Add(kvp.Key, kvp.Value); |
194 | } | 207 | } |