OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2013-01-13 16:27:47 +01:00
parent a696253081 b263587e21
commit ee6333f89b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
View File

@ -501,7 +501,8 @@ namespace OpenSim.Region.ClientStack.Linden
ScenePresence p; ScenePresence p;
if (m_scene.TryGetScenePresence(User, out p)) // If we don't get a user they're not here anymore. if (m_scene.TryGetScenePresence(User, out p)) // If we don't get a user they're not here anymore.
{ {
AlterThrottle(UserSetThrottle, p); // AlterThrottle(UserSetThrottle, p);
UpdateThrottle(UserSetThrottle, p);
} }
} }
} }
@ -546,7 +547,12 @@ namespace OpenSim.Region.ClientStack.Linden
// Client set throttle ! // Client set throttle !
UserSetThrottle = pimagethrottle; UserSetThrottle = pimagethrottle;
CapSetThrottle = (int)(pimagethrottle*CapThrottleDistributon); CapSetThrottle = (int)(pimagethrottle*CapThrottleDistributon);
UDPSetThrottle = (int) (pimagethrottle*(100 - CapThrottleDistributon)); // UDPSetThrottle = (int) (pimagethrottle*(100 - CapThrottleDistributon));
float udp = 1.0f - CapThrottleDistributon;
if(udp < 0.5f)
udp = 0.5f;
UDPSetThrottle = (int) ((float)pimagethrottle * udp);
if (CapSetThrottle < 4068) if (CapSetThrottle < 4068)
CapSetThrottle = 4068; // at least two discovery mesh CapSetThrottle = 4068; // at least two discovery mesh
p.ControllingClient.SetAgentThrottleSilent((int) Throttle, UDPSetThrottle); p.ControllingClient.SetAgentThrottleSilent((int) Throttle, UDPSetThrottle);