diff options
| author | Diva Canto | 2010-06-25 05:15:54 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-25 05:15:54 -0700 |
| commit | 7488f612891e2bd34012ab181bedc832140a4d4d (patch) | |
| tree | 5de32ecc585a8457af3a5dc89f1b010412196bb3 /OpenSim/Region/Framework/Scenes/Prioritizer.cs | |
| parent | This file wants to be committed. Line endings mess up. (diff) | |
| parent | * SimianAssetServiceConnector Delete() was expecting the wrong type of respon... (diff) | |
| download | opensim-SC-7488f612891e2bd34012ab181bedc832140a4d4d.zip opensim-SC-7488f612891e2bd34012ab181bedc832140a4d4d.tar.gz opensim-SC-7488f612891e2bd34012ab181bedc832140a4d4d.tar.bz2 opensim-SC-7488f612891e2bd34012ab181bedc832140a4d4d.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 | { |