aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2013-01-16 16:46:43 +0100
committerMelanie2013-01-16 16:46:43 +0100
commitd92d5ca1fd2f84841881f5822316b4ba225e679d (patch)
tree6d7da547d04eb7d98b69d87f02f7571a3a364e99 /OpenSim
parent fix STATE udp queue data rate since it is in use again, after being (diff)
downloadopensim-SC_OLD-d92d5ca1fd2f84841881f5822316b4ba225e679d.zip
opensim-SC_OLD-d92d5ca1fd2f84841881f5822316b4ba225e679d.tar.gz
opensim-SC_OLD-d92d5ca1fd2f84841881f5822316b4ba225e679d.tar.bz2
opensim-SC_OLD-d92d5ca1fd2f84841881f5822316b4ba225e679d.tar.xz
Revert " fix STATE udp queue data rate since it is in use again, after being"
This reverts commit 4d92c6b39f3ebb7a27517493b66d097d9d9d23dd.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 6485c1a..f675377 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -339,9 +339,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
339 int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4; 339 int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
340 int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); 340 int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
341 // State is a subcategory of task that we allocate a percentage to 341 // State is a subcategory of task that we allocate a percentage to
342// int state = 0; 342 int state = 0;
343 int state = (int)((1.0f - STATE_TASK_PERCENTAGE) * (float)task);
344 task = (int)(STATE_TASK_PERCENTAGE * (float)task);
345 343
346 // Make sure none of the throttles are set below our packet MTU, 344 // Make sure none of the throttles are set below our packet MTU,
347 // otherwise a throttle could become permanently clogged 345 // otherwise a throttle could become permanently clogged
@@ -352,7 +350,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
352 task = Math.Max(task, LLUDPServer.MTU); 350 task = Math.Max(task, LLUDPServer.MTU);
353 texture = Math.Max(texture, LLUDPServer.MTU); 351 texture = Math.Max(texture, LLUDPServer.MTU);
354 asset = Math.Max(asset, LLUDPServer.MTU); 352 asset = Math.Max(asset, LLUDPServer.MTU);
355 state = Math.Max(state, LLUDPServer.MTU);
356 353
357 //int total = resend + land + wind + cloud + task + texture + asset; 354 //int total = resend + land + wind + cloud + task + texture + asset;
358 //m_log.DebugFormat("[LLUDPCLIENT]: {0} is setting throttles. Resend={1}, Land={2}, Wind={3}, Cloud={4}, Task={5}, Texture={6}, Asset={7}, Total={8}", 355 //m_log.DebugFormat("[LLUDPCLIENT]: {0} is setting throttles. Resend={1}, Land={2}, Wind={3}, Cloud={4}, Task={5}, Texture={6}, Asset={7}, Total={8}",