Committing Jim's optimization to replace the 20ms sleep in outgoing packet handling with an interruptible wait handle

1 files changed, 10 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
index 0a64095..bdbd284 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
@@ -98,6 +98,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         /// <summary>
+        /// The speed limit of this bucket in bytes per millisecond
+        /// </summary>
+        public int DripPerMS
+        {
+            get { return tokensPerMS; }
+        }
+
+        /// <summary>
         /// The number of bytes that can be sent at this moment. This is the
         /// current number of tokens in the bucket
         /// <remarks>If this bucket has a parent bucket that does not have
@@ -106,11 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// </summary>
         public int Content
         {
-            get
-            {
-                Drip();
-                return content;
-            }
+            get { return content; }
         }
 
         #endregion Properties
@@ -182,7 +186,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// call to Drip
         /// </summary>
         /// <returns>True if tokens were added to the bucket, otherwise false</returns>
-        private bool Drip()
+        public bool Drip()
         {
             if (tokensPerMS == 0)
             {