1 files changed, 58 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ed4cafa..bcae69f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1118,6 +1118,20 @@ namespace OpenSim.Region.Framework.Scenes
                     m_LandingPointBehavior = LandingPointBehavior.SL;
             }
 
+            m_bandwidth = 100000;
+            m_lastBandwithTime = Util.GetTimeStamp() + 0.1;
+            IConfig cconfig = m_scene.Config.Configs["ClientStack.LindenCaps"];
+            if (cconfig != null)
+            {
+                m_capbandwidth = cconfig.GetInt("Cap_AssetThrottle", m_capbandwidth);
+                if(m_capbandwidth > 0)
+                {
+                    m_bandwidth = m_capbandwidth;
+                    if(m_bandwidth < 50000)
+                        m_bandwidth = 50000;
+                }
+            }
+            m_bandwidthBurst = m_bandwidth / 5;
             ControllingClient.RefreshGroupMembership();
 
         }
@@ -4626,7 +4640,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void RaiseUpdateThrottles()
         {
-            m_scene.EventManager.TriggerThrottleUpdate(this);
+            if(m_capbandwidth > 0)
+                return;
+            m_bandwidth = 4 * ControllingClient.GetAgentThrottleSilent((int)ThrottleOutPacketType.Texture);
+            if(m_bandwidth < 50000)
+                m_bandwidth = 50000;
+            m_bandwidthBurst = m_bandwidth / 5;
         }
 
         /// <summary>
@@ -5834,7 +5853,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if (scriptedcontrols.TryGetValue(Script_item_UUID, out takecontrols))
                 {
-                   ScriptControlled sctc = takecontrols.eventControls;
+                    ScriptControlled sctc = takecontrols.eventControls;
 
                     ControllingClient.SendTakeControls((int)sctc, false, false);
                     ControllingClient.SendTakeControls((int)sctc, true, false);
@@ -6830,5 +6849,42 @@ namespace OpenSim.Region.Framework.Scenes
         {
             return Overrides.GetOverriddenAnimation(animState);
         }
+
+        // http caps assets bandwidth control
+        private int m_capbandwidth = -1;
+        private int m_bandwidth = 100000;
+        private int m_bandwidthBurst = 20000;
+        private int m_bytesControl;
+        private double m_lastBandwithTime;
+
+        public bool CapCanSendAsset(int type, int size)
+        {
+            if(size == 0)
+                return true;
+
+            if(type > 1)
+            {
+                // not texture or mesh
+                m_bytesControl -= size;
+                return true;
+            }
+
+            double currenttime = Util.GetTimeStamp();
+            double timeElapsed = currenttime - m_lastBandwithTime;
+            if (timeElapsed > .05)
+            {
+                m_lastBandwithTime = currenttime;
+                int add = (int)(m_bandwidth * timeElapsed);
+                m_bytesControl += add;
+                if (m_bytesControl > m_bandwidthBurst)
+                    m_bytesControl = m_bandwidthBurst;
+            }
+            if (m_bytesControl > 0 )
+            {
+                m_bytesControl -= size;
+                return true;
+            }
+            return false;
+        }
     }
 }