diff options
author | Justin Clarke Casey | 2008-06-03 08:11:04 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-06-03 08:11:04 +0000 |
commit | f45fa849053cccadf57a21592cdc93e93aabfd9c (patch) | |
tree | 2d8d4a67c19021e0d4bfe36d2de17691c1cfcbe8 /OpenSim/Region | |
parent | * This should fix presence issues. (diff) | |
download | opensim-SC-f45fa849053cccadf57a21592cdc93e93aabfd9c.zip opensim-SC-f45fa849053cccadf57a21592cdc93e93aabfd9c.tar.gz opensim-SC-f45fa849053cccadf57a21592cdc93e93aabfd9c.tar.bz2 opensim-SC-f45fa849053cccadf57a21592cdc93e93aabfd9c.tar.xz |
* Remove what should be unnecessary locking of GetScenePresences()
* May help with mantis 1434 though I doubt it
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 3e250da..b6ba706 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -627,19 +627,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
627 | #region Get Methods | 627 | #region Get Methods |
628 | 628 | ||
629 | /// <summary> | 629 | /// <summary> |
630 | /// Request a List of all m_scenePresences in this World | 630 | /// Request a List of all scene presences in this scene. This returns a copy of the original list, so no |
631 | /// locking is required to iterate over it. | ||
631 | /// </summary> | 632 | /// </summary> |
632 | /// <returns></returns> | 633 | /// <returns></returns> |
633 | protected internal List<ScenePresence> GetScenePresences() | 634 | protected internal List<ScenePresence> GetScenePresences() |
634 | { | 635 | { |
635 | List<ScenePresence> result; | 636 | return new List<ScenePresence>(ScenePresences.Values); |
636 | |||
637 | lock (ScenePresences) | ||
638 | { | ||
639 | result = new List<ScenePresence>(ScenePresences.Values); | ||
640 | } | ||
641 | |||
642 | return result; | ||
643 | } | 637 | } |
644 | 638 | ||
645 | protected internal List<ScenePresence> GetAvatars() | 639 | protected internal List<ScenePresence> GetAvatars() |