aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
index 94f7214..1e369ec 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
@@ -29,8 +29,8 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Threading; 30using System.Threading;
31using System.Timers; 31using System.Timers;
32using libsecondlife; 32using OpenMetaverse;
33using libsecondlife.Packets; 33using OpenMetaverse.Packets;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Statistics; 35using OpenSim.Framework.Statistics;
36using OpenSim.Framework.Statistics.Interfaces; 36using OpenSim.Framework.Statistics.Interfaces;
@@ -82,9 +82,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
82 // private long ThrottleInterval; 82 // private long ThrottleInterval;
83 private Timer throttleTimer; 83 private Timer throttleTimer;
84 84
85 private LLUUID m_agentId; 85 private UUID m_agentId;
86 86
87 public LLPacketQueue(LLUUID agentId) 87 public LLPacketQueue(UUID agentId)
88 { 88 {
89 // While working on this, the BlockingQueue had me fooled for a bit. 89 // While working on this, the BlockingQueue had me fooled for a bit.
90 // The Blocking queue causes the thread to stop until there's something 90 // The Blocking queue causes the thread to stop until there's something
@@ -479,7 +479,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
479 for (int i = 0; i < 7; i++) 479 for (int i = 0; i < 7; i++)
480 Array.Reverse(throttle, j + i*singlefloat, singlefloat); 480 Array.Reverse(throttle, j + i*singlefloat, singlefloat);
481 481
482 // values gotten from libsecondlife.org/wiki/Throttle. Thanks MW_ 482 // values gotten from OpenMetaverse.org/wiki/Throttle. Thanks MW_
483 // bytes 483 // bytes
484 // Convert to integer, since.. the full fp space isn't used. 484 // Convert to integer, since.. the full fp space isn't used.
485 tResend = (int) BitConverter.ToSingle(throttle, j); 485 tResend = (int) BitConverter.ToSingle(throttle, j);