diff options
| author | Robert Adams | 2013-02-06 16:18:27 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-02-06 16:18:27 -0800 |
| commit | 5d523ea49340a8af0e16b0aec4d302a78569a66c (patch) | |
| tree | c54af38bff50eb9901ec5eaa0e72da444a864ba6 /OpenSim | |
| parent | BulletSim: set removing zero width triangles in meshes to be enabled by defau... (diff) | |
| parent | Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to m... (diff) | |
| download | opensim-SC_OLD-5d523ea49340a8af0e16b0aec4d302a78569a66c.zip opensim-SC_OLD-5d523ea49340a8af0e16b0aec4d302a78569a66c.tar.gz opensim-SC_OLD-5d523ea49340a8af0e16b0aec4d302a78569a66c.tar.bz2 opensim-SC_OLD-5d523ea49340a8af0e16b0aec4d302a78569a66c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/DAMap.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs index 291c8b8..dd9c61b 100644 --- a/OpenSim/Framework/DAMap.cs +++ b/OpenSim/Framework/DAMap.cs | |||
| @@ -188,7 +188,8 @@ namespace OpenSim.Framework | |||
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | public void Add(KeyValuePair<string, OSDMap> kvp) | 190 | public void Add(KeyValuePair<string, OSDMap> kvp) |
| 191 | { | 191 | { |
| 192 | ValidateKey(kvp.Key); | ||
| 192 | lock (this) | 193 | lock (this) |
| 193 | m_map.Add(kvp.Key, kvp.Value); | 194 | m_map.Add(kvp.Key, kvp.Value); |
| 194 | } | 195 | } |