aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-06-22 02:33:20 +0200
committerMelanie2010-06-22 23:39:39 +0100
commit68551675dfcd0e159185345e8cb7ac54b3530abf (patch)
treeffe17062ff73a014ee3488c80dd80066b5f0b06f
parentSecurity fix: Allow only textures to be fetched using HTTP texture cap (diff)
downloadopensim-SC_OLD-68551675dfcd0e159185345e8cb7ac54b3530abf.zip
opensim-SC_OLD-68551675dfcd0e159185345e8cb7ac54b3530abf.tar.gz
opensim-SC_OLD-68551675dfcd0e159185345e8cb7ac54b3530abf.tar.bz2
opensim-SC_OLD-68551675dfcd0e159185345e8cb7ac54b3530abf.tar.xz
Guard prioritizer agains null values as those produced by a bullet dying
before it can be updated
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 7b7677b..de3c360 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -52,6 +52,9 @@ namespace OpenSim.Region.Framework.Scenes
52 public double GetUpdatePriority(IClientAPI client, ISceneEntity entity) 52 public double GetUpdatePriority(IClientAPI client, ISceneEntity entity)
53 { 53 {
54 double priority = 0; 54 double priority = 0;
55
56 if (entity == null)
57 return 100000;
55 58
56 switch (m_scene.UpdatePrioritizationScheme) 59 switch (m_scene.UpdatePrioritizationScheme)
57 { 60 {