aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/DAMap.cs
diff options
context:
space:
mode:
authorMic Bowman2013-02-06 17:32:57 -0800
committerMic Bowman2013-02-06 17:32:57 -0800
commit274d376c82c8cfd6fa8ef5873f77567446c8b64d (patch)
tree06eb4ade64b736762ffbfbd1364fb4942bfbe1e4 /OpenSim/Framework/DAMap.cs
parentEnables script access to the per object dynamic attributes through the JsonStore (diff)
parentMerge branch 'master' of git://opensimulator.org/git/opensim (diff)
downloadopensim-SC_OLD-274d376c82c8cfd6fa8ef5873f77567446c8b64d.zip
opensim-SC_OLD-274d376c82c8cfd6fa8ef5873f77567446c8b64d.tar.gz
opensim-SC_OLD-274d376c82c8cfd6fa8ef5873f77567446c8b64d.tar.bz2
opensim-SC_OLD-274d376c82c8cfd6fa8ef5873f77567446c8b64d.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.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index 7d7738a..64cea77 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -176,6 +176,10 @@ namespace OpenSim.Framework
176 } 176 }
177 } 177 }
178 178
179 /// <summary>
180 /// Validate the key used for storing separate data stores.
181 /// </summary>
182 /// <param name='key'></param>
179 private static void ValidateKey(string key) 183 private static void ValidateKey(string key)
180 { 184 {
181 if (key.Length < MIN_STORE_NAME_LENGTH) 185 if (key.Length < MIN_STORE_NAME_LENGTH)
@@ -196,7 +200,8 @@ namespace OpenSim.Framework
196 } 200 }
197 201
198 public void Add(KeyValuePair<string, OSDMap> kvp) 202 public void Add(KeyValuePair<string, OSDMap> kvp)
199 { 203 {
204 ValidateKey(kvp.Key);
200 lock (this) 205 lock (this)
201 m_map.Add(kvp.Key, kvp.Value); 206 m_map.Add(kvp.Key, kvp.Value);
202 } 207 }