diff options
| author | John Hurliman | 2010-09-10 12:04:12 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-09-10 12:04:12 -0700 |
| commit | dd277a0d02f1aa79f4fcb5d108cbc696e90500c2 (patch) | |
| tree | 7e396d347e43504ec23c59c3749f995f15c2e254 /OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | |
| parent | * Run SimianGrid session updates asynchronously instead of from the main hear... (diff) | |
| download | opensim-SC_OLD-dd277a0d02f1aa79f4fcb5d108cbc696e90500c2.zip opensim-SC_OLD-dd277a0d02f1aa79f4fcb5d108cbc696e90500c2.tar.gz opensim-SC_OLD-dd277a0d02f1aa79f4fcb5d108cbc696e90500c2.tar.bz2 opensim-SC_OLD-dd277a0d02f1aa79f4fcb5d108cbc696e90500c2.tar.xz | |
First pass at cleaning up thread safety in EntityManager and SceneGraph
Diffstat (limited to 'OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs index 2730eee..49d20e1 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | |||
| @@ -127,7 +127,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
| 127 | /// </summary> | 127 | /// </summary> |
| 128 | public void FindDifferences() | 128 | public void FindDifferences() |
| 129 | { | 129 | { |
| 130 | System.Collections.Generic.List<EntityBase> sceneEntityList = m_Entity.Scene.GetEntities(); | 130 | List<EntityBase> sceneEntityList = new List<EntityBase>(m_Entity.Scene.GetEntities()); |
| 131 | DiffersFromSceneGroup = false; | 131 | DiffersFromSceneGroup = false; |
| 132 | // if group is not contained in scene's list | 132 | // if group is not contained in scene's list |
| 133 | if (!ContainsKey(sceneEntityList, m_UnchangedEntity.UUID)) | 133 | if (!ContainsKey(sceneEntityList, m_UnchangedEntity.UUID)) |