From f97aeab9163fb24bee16a0a85328a8d177b046fb Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Thu, 22 Nov 2007 21:40:53 +0000
Subject: * Quelled a Log format exception in the logging routines. * Tweaked
 some esoteric throttle settings * Removed AgentThrottle from the unsupported
 packet list.

---
 OpenSim/Framework/Console/LogBase.cs                    | 17 +++++++++++++++--
 OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs | 11 ++++++++---
 OpenSim/Region/ClientStack/ClientView.cs                |  4 ++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 6651e5d..ec3c5bc 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -238,9 +238,16 @@ namespace OpenSim.Framework.Console
             {
                 string now = DateTime.Now.ToString("[MM-dd hh:mm:ss] ");
                 Log.Write(now);
-                Log.WriteLine(format, args);
-                Log.Flush();
+                try
+                {
+                    Log.WriteLine(format, args);
+                    Log.Flush();
+                }
 
+                catch (FormatException FE)
+                {
+                    System.Console.WriteLine(args);
+                }
                 System.Console.Write(now);
                 try
                 {
@@ -255,6 +262,12 @@ namespace OpenSim.Framework.Console
                     // Some older systems dont support coloured text.
                     System.Console.WriteLine(format, args);
                 }
+                 catch (System.FormatException)
+                {
+                    // Some older systems dont support coloured text.
+                    System.Console.WriteLine(args);
+                }
+                
                 return;
             }
         }
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index 93c12a6..8c4dba6 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -783,7 +783,7 @@ namespace OpenSim.Region.ClientStack
 
                     case PacketType.AgentThrottle:
 
-                        OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "unhandled packet " + Pack.ToString());
+                        //OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "unhandled packet " + Pack.ToString());
 
                         AgentThrottlePacket atpack = (AgentThrottlePacket)Pack;
 
@@ -825,6 +825,7 @@ namespace OpenSim.Region.ClientStack
                         tAsset = (int)BitConverter.ToSingle(throttle, j);
 
                         tall = tResend + tLand + tWind + tCloud + tTask + tTexture + tAsset;
+                        /*
                         OpenSim.Framework.Console.MainLog.Instance.Verbose("CLIENT", "Client AgentThrottle - Got throttle:resendbytes=" + tResend +
                             " landbytes=" + tLand +
                             " windbytes=" + tWind +
@@ -833,6 +834,8 @@ namespace OpenSim.Region.ClientStack
                             " texturebytes=" + tTexture +
                             " Assetbytes=" + tAsset +
                             " Allbytes=" + tall);
+                         */
+
                         // Total Sanity
                         // Make sure that the client sent sane total values.
 
@@ -896,7 +899,7 @@ namespace OpenSim.Region.ClientStack
                             if (tAsset < AssetthrottleMin)
                                 AssetthrottleOutbound = AssetthrottleMin;
 
-                            OpenSim.Framework.Console.MainLog.Instance.Verbose("THROTTLE", "Using:resendbytes=" + ResendthrottleOutbound +
+                          /*  OpenSim.Framework.Console.MainLog.Instance.Verbose("THROTTLE", "Using:resendbytes=" + ResendthrottleOutbound +
                             " landbytes=" + LandthrottleOutbound +
                             " windbytes=" + WindthrottleOutbound +
                             " cloudbytes=" + CloudthrottleOutbound +
@@ -904,6 +907,7 @@ namespace OpenSim.Region.ClientStack
                             " texturebytes=" + TexturethrottleOutbound +
                             " Assetbytes=" + AssetthrottleOutbound +
                             " Allbytes=" + tall);
+                           */
                         }
                         else
                         {
@@ -1006,7 +1010,7 @@ namespace OpenSim.Region.ClientStack
                                 if (tAssetResult < AssetthrottleMin)
                                     AssetthrottleOutbound = AssetthrottleMin;
 
-                                OpenSim.Framework.Console.MainLog.Instance.Verbose("THROTTLE", "Using:resendbytes=" + ResendthrottleOutbound +
+                                /* OpenSim.Framework.Console.MainLog.Instance.Verbose("THROTTLE", "Using:resendbytes=" + ResendthrottleOutbound +
                                     " landbytes=" + LandthrottleOutbound +
                                     " windbytes=" + WindthrottleOutbound +
                                     " cloudbytes=" + CloudthrottleOutbound +
@@ -1014,6 +1018,7 @@ namespace OpenSim.Region.ClientStack
                                     " texturebytes=" + TexturethrottleOutbound +
                                     " Assetbytes=" + AssetthrottleOutbound +
                                     " Allbytes=" + tall);
+                                  */
 
                             }
                             else
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 411883b..b4441ec 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.ClientStack
         // TODO: Make this variable. Lower throttle on un-ack. Raise over time
 
         // All throttle times and number of bytes are calculated by dividing by this value
-        private int throttleTimeDivisor = 5;
+        private int throttleTimeDivisor = 7;
 
         private int throttletimems = 1000;
 
@@ -208,7 +208,7 @@ namespace OpenSim.Region.ClientStack
             // The General overhead of the UDP protocol gets sent to the queue un-throttled by this
             // so This'll pick up about around the right time.
 
-            int MaxThrottleLoops = 5550; // 50*7 packets can be dequeued at once.
+            int MaxThrottleLoops = 4550; // 50*7 packets can be dequeued at once.
             int throttleLoops = 0;
 
             // We're going to dequeue all of the saved up packets until 
-- 
cgit v1.1