aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-30 01:48:05 +0000
committerJustin Clark-Casey (justincc)2012-10-30 01:48:05 +0000
commit984faf24dfaea26cdd436c8097abf334b74ebed8 (patch)
treeb1764ade07e0ca203261f55b7e747558852f107e
parentLog warning if mesh/sculpt asset couldn't be found by ODEPrim.MeshAssetReceiv... (diff)
downloadopensim-SC_OLD-984faf24dfaea26cdd436c8097abf334b74ebed8.zip
opensim-SC_OLD-984faf24dfaea26cdd436c8097abf334b74ebed8.tar.gz
opensim-SC_OLD-984faf24dfaea26cdd436c8097abf334b74ebed8.tar.bz2
opensim-SC_OLD-984faf24dfaea26cdd436c8097abf334b74ebed8.tar.xz
Only create a new list to check if objects have reached targets if there actually are any targets.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs14
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7d8cbf5..69c1027 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1692,15 +1692,19 @@ namespace OpenSim.Region.Framework.Scenes
1692 1692
1693 private void CheckAtTargets() 1693 private void CheckAtTargets()
1694 { 1694 {
1695 List<SceneObjectGroup> objs = new List<SceneObjectGroup>(); 1695 List<SceneObjectGroup> objs = null;
1696
1696 lock (m_groupsWithTargets) 1697 lock (m_groupsWithTargets)
1697 { 1698 {
1698 foreach (SceneObjectGroup grp in m_groupsWithTargets.Values) 1699 if (m_groupsWithTargets.Count != 0)
1699 objs.Add(grp); 1700 objs = new List<SceneObjectGroup>(m_groupsWithTargets.Values);
1700 } 1701 }
1701 1702
1702 foreach (SceneObjectGroup entry in objs) 1703 if (objs != null)
1703 entry.checkAtTargets(); 1704 {
1705 foreach (SceneObjectGroup entry in objs)
1706 entry.checkAtTargets();
1707 }
1704 } 1708 }
1705 1709
1706 /// <summary> 1710 /// <summary>