diff options
| author | Justin Clark-Casey (justincc) | 2010-06-23 01:22:42 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-06-23 01:22:42 +0100 |
| commit | 1719dc9a9b6f87c006c04997005e83c66b134075 (patch) | |
| tree | 686d63018385842ace3a614fdd1a05d16806ed63 /OpenSim/Region/Framework/Scenes/Prioritizer.cs | |
| parent | add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch to... (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.zip opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.gz opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.bz2 opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Prioritizer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Prioritizer.cs | 3 |
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 | { |