diff options
author | John Hurliman | 2010-09-10 12:41:36 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-10 12:41:36 -0700 |
commit | b597a295c489cef217b9dca6bd22df1340ca39ce (patch) | |
tree | dbd74bb48f962fb7b64cc67db6df890451859782 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | First pass at cleaning up thread safety in EntityManager and SceneGraph (diff) | |
download | opensim-SC_OLD-b597a295c489cef217b9dca6bd22df1340ca39ce.zip opensim-SC_OLD-b597a295c489cef217b9dca6bd22df1340ca39ce.tar.gz opensim-SC_OLD-b597a295c489cef217b9dca6bd22df1340ca39ce.tar.bz2 opensim-SC_OLD-b597a295c489cef217b9dca6bd22df1340ca39ce.tar.xz |
Second pass at cleaning up thread safety in EntityManager and SceneGraph
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 09e3e0e..ba5e33c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2091,16 +2091,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2091 | /// <returns>null if a child part with the primID was not found</returns> | 2091 | /// <returns>null if a child part with the primID was not found</returns> |
2092 | public SceneObjectPart GetChildPart(UUID primID) | 2092 | public SceneObjectPart GetChildPart(UUID primID) |
2093 | { | 2093 | { |
2094 | SceneObjectPart childPart = null; | 2094 | SceneObjectPart childPart; |
2095 | |||
2096 | lock (m_parts) | 2095 | lock (m_parts) |
2097 | { | 2096 | m_parts.TryGetValue(primID, out childPart); |
2098 | if (m_parts.ContainsKey(primID)) | ||
2099 | { | ||
2100 | childPart = m_parts[primID]; | ||
2101 | } | ||
2102 | } | ||
2103 | |||
2104 | return childPart; | 2097 | return childPart; |
2105 | } | 2098 | } |
2106 | 2099 | ||