aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityManager.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs15
2 files changed, 14 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index b788a3c..7181313 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework;
34 35
35namespace OpenSim.Region.Framework.Scenes 36namespace OpenSim.Region.Framework.Scenes
36{ 37{
@@ -38,7 +39,8 @@ namespace OpenSim.Region.Framework.Scenes
38 { 39 {
39// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 41
41 private readonly DoubleDictionary<UUID, uint, EntityBase> m_entities = new DoubleDictionary<UUID, uint, EntityBase>(); 42 private readonly DoubleDictionaryThreadAbortSafe<UUID, uint, EntityBase> m_entities
43 = new DoubleDictionaryThreadAbortSafe<UUID, uint, EntityBase>();
42 44
43 public int Count 45 public int Count
44 { 46 {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1ad5edd..cca295c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5638,10 +5638,17 @@ namespace OpenSim.Region.Framework.Scenes
5638 return m_SpawnPoint - 1; 5638 return m_SpawnPoint - 1;
5639 } 5639 }
5640 5640
5641 // Wrappers to get physics modules retrieve assets. Has to be done this way 5641 /// <summary>
5642 // because we can't assign the asset service to physics directly - at the 5642 /// Wrappers to get physics modules retrieve assets.
5643 // time physics are instantiated it's not registered but it will be by 5643 /// </summary>
5644 // the time the first prim exists. 5644 /// <remarks>
5645 /// Has to be done this way
5646 /// because we can't assign the asset service to physics directly - at the
5647 /// time physics are instantiated it's not registered but it will be by
5648 /// the time the first prim exists.
5649 /// </remarks>
5650 /// <param name="assetID"></param>
5651 /// <param name="callback"></param>
5645 public void PhysicsRequestAsset(UUID assetID, AssetReceivedDelegate callback) 5652 public void PhysicsRequestAsset(UUID assetID, AssetReceivedDelegate callback)
5646 { 5653 {
5647 AssetService.Get(assetID.ToString(), callback, PhysicsAssetReceived); 5654 AssetService.Get(assetID.ToString(), callback, PhysicsAssetReceived);