minor cleanup

melanie
UbitUmarov 2016-10-02 11:54:07 +01:00
parent cd9d176c3c
commit f3e7603c37
1 changed files with 5 additions and 4 deletions

View File

@ -286,9 +286,10 @@ namespace OpenSim.Region.Framework.Scenes
{ {
// And convert the distance to a priority queue, this computation gives queues // And convert the distance to a priority queue, this computation gives queues
// at 10, 20, 40, 80, 160, 320, 640, and 1280m // at 10, 20, 40, 80, 160, 320, 640, and 1280m
uint minpqueue = PriorityQueue.NumberOfImmediateQueues; // uint minpqueue = PriorityQueue.NumberOfImmediateQueues;
uint maxqueue = PriorityQueue.NumberOfQueues - PriorityQueue.NumberOfImmediateQueues -1; uint maxqueue = PriorityQueue.NumberOfQueues - PriorityQueue.NumberOfImmediateQueues -1;
uint pqueue = minpqueue; // uint pqueue = minpqueue;
uint pqueue = PriorityQueue.NumberOfImmediateQueues;
float distance; float distance;
Vector3 presencePos = presence.AbsolutePosition; Vector3 presencePos = presence.AbsolutePosition;
@ -308,10 +309,10 @@ namespace OpenSim.Region.Framework.Scenes
distance *= group.getAreaFactor(); distance *= group.getAreaFactor();
if(group.IsAttachment) if(group.IsAttachment)
distance *= 0.5f; distance *= 0.5f;
else if(group.GetSittingAvatarsCount() > 0)
distance *= 0.5f;
else if(group.UsesPhysics) else if(group.UsesPhysics)
distance *= 0.6f; distance *= 0.6f;
else if(group.GetSittingAvatarsCount() > 0)
distance *= 0.5f;
} }
if (distance > 10f) if (distance > 10f)