diff options
author | UbitUmarov | 2016-10-02 11:54:07 +0100 |
---|---|---|
committer | UbitUmarov | 2016-10-02 11:54:07 +0100 |
commit | f3e7603c37a5448f5a4ac59a2621b24724707288 (patch) | |
tree | 55d2d3f88d3b8cd8860edd325bec5f93b46e0486 /OpenSim/Region | |
parent | change avatar and attachments priority (downgraded) in priritizer option Sim... (diff) | |
download | opensim-SC_OLD-f3e7603c37a5448f5a4ac59a2621b24724707288.zip opensim-SC_OLD-f3e7603c37a5448f5a4ac59a2621b24724707288.tar.gz opensim-SC_OLD-f3e7603c37a5448f5a4ac59a2621b24724707288.tar.bz2 opensim-SC_OLD-f3e7603c37a5448f5a4ac59a2621b24724707288.tar.xz |
minor cleanup
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Prioritizer.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index ed80b3a..97009a0 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
@@ -286,9 +286,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
286 | { | 286 | { |
287 | // And convert the distance to a priority queue, this computation gives queues | 287 | // And convert the distance to a priority queue, this computation gives queues |
288 | // at 10, 20, 40, 80, 160, 320, 640, and 1280m | 288 | // at 10, 20, 40, 80, 160, 320, 640, and 1280m |
289 | uint minpqueue = PriorityQueue.NumberOfImmediateQueues; | 289 | // uint minpqueue = PriorityQueue.NumberOfImmediateQueues; |
290 | uint maxqueue = PriorityQueue.NumberOfQueues - PriorityQueue.NumberOfImmediateQueues -1; | 290 | uint maxqueue = PriorityQueue.NumberOfQueues - PriorityQueue.NumberOfImmediateQueues -1; |
291 | uint pqueue = minpqueue; | 291 | // uint pqueue = minpqueue; |
292 | uint pqueue = PriorityQueue.NumberOfImmediateQueues; | ||
292 | float distance; | 293 | float distance; |
293 | 294 | ||
294 | Vector3 presencePos = presence.AbsolutePosition; | 295 | Vector3 presencePos = presence.AbsolutePosition; |
@@ -308,10 +309,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
308 | distance *= group.getAreaFactor(); | 309 | distance *= group.getAreaFactor(); |
309 | if(group.IsAttachment) | 310 | if(group.IsAttachment) |
310 | distance *= 0.5f; | 311 | distance *= 0.5f; |
311 | else if(group.GetSittingAvatarsCount() > 0) | ||
312 | distance *= 0.5f; | ||
313 | else if(group.UsesPhysics) | 312 | else if(group.UsesPhysics) |
314 | distance *= 0.6f; | 313 | distance *= 0.6f; |
314 | else if(group.GetSittingAvatarsCount() > 0) | ||
315 | distance *= 0.5f; | ||
315 | } | 316 | } |
316 | 317 | ||
317 | if (distance > 10f) | 318 | if (distance > 10f) |