diff options
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index ff471e0..35134d6 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -123,7 +123,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 123 | } | 123 | } |
| 124 | if (m_partsLock.RecursiveWriteCount > 0) | 124 | if (m_partsLock.RecursiveWriteCount > 0) |
| 125 | { | 125 | { |
| 126 | m_log.Error("[SceneObjectGroup.m_parts] Recursive read lock requested. This should not happen and means something needs to be fixed."); | 126 | m_log.Error("[SceneObjectGroup.m_parts] Recursive read lock requested (write lock exists on this thread). This should not happen and means something needs to be fixed."); |
| 127 | m_partsLock.ExitWriteLock(); | 127 | m_partsLock.ExitWriteLock(); |
| 128 | } | 128 | } |
| 129 | 129 | ||
| @@ -1667,6 +1667,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1667 | remoteClient, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, part.UUID)); | 1667 | remoteClient, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, part.UUID)); |
| 1668 | } | 1668 | } |
| 1669 | } | 1669 | } |
| 1670 | lockPartsForRead(false); | ||
| 1670 | } | 1671 | } |
| 1671 | 1672 | ||
| 1672 | #region Copying | 1673 | #region Copying |