diff options
| author | Justin Clark-Casey (justincc) | 2010-09-21 01:01:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-21 01:01:07 +0100 |
| commit | 192bcab98711245e241f1b37cb12cc29a26b168e (patch) | |
| tree | 6e72ef2c0b7d20355f29119a603877786d83bf37 /OpenSim/Framework/MapAndArray.cs | |
| parent | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ... (diff) | |
| parent | * Tweaked the LocationTests for maximum coverage. (diff) | |
| download | opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.zip opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.gz opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.bz2 opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/MapAndArray.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/MapAndArray.cs b/OpenSim/Framework/MapAndArray.cs index bbe6a9e..c98d3cc 100644 --- a/OpenSim/Framework/MapAndArray.cs +++ b/OpenSim/Framework/MapAndArray.cs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
| 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
| 4 | * | 4 | * |
| @@ -131,7 +131,8 @@ namespace OpenSim.Framework | |||
| 131 | /// <returns>True if the key was found, otherwise false</returns> | 131 | /// <returns>True if the key was found, otherwise false</returns> |
| 132 | public bool ContainsKey(TKey key) | 132 | public bool ContainsKey(TKey key) |
| 133 | { | 133 | { |
| 134 | return m_dict.ContainsKey(key); | 134 | lock (m_syncRoot) |
| 135 | return m_dict.ContainsKey(key); | ||
| 135 | } | 136 | } |
| 136 | 137 | ||
| 137 | /// <summary> | 138 | /// <summary> |