Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge

4 files changed, 13 insertions, 23 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6588f3d..de08f90 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <value>
         /// Debug packet level.  See OpenSim.RegisterConsoleCommands() for more details.
         /// </value>
-        protected int m_debugPacketLevel = 0;
+        public int DebugPacketLevel { get; set; }
 
         #region Events
 
@@ -487,11 +487,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             RegisterLocalPacketHandlers();
         }
 
-        public void SetDebugPacketLevel(int newDebug)
-        {
-            m_debugPacketLevel = newDebug;
-        }
-
         #region Client Methods
 
 
@@ -11715,25 +11710,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// provide your own method.</param>
         protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting, UnackedPacketMethod method)
         {
-            if (m_debugPacketLevel > 0)
+            if (DebugPacketLevel > 0)
             {
                 bool logPacket = true;
 
-                if (m_debugPacketLevel <= 255
+                if (DebugPacketLevel <= 255
                     && (packet.Type == PacketType.SimStats || packet.Type == PacketType.SimulatorViewerTimeMessage))
                     logPacket = false;
 
-                if (m_debugPacketLevel <= 200
+                if (DebugPacketLevel <= 200
                     && (packet.Type == PacketType.ImagePacket
                         || packet.Type == PacketType.ImageData
                         || packet.Type == PacketType.LayerData
                         || packet.Type == PacketType.CoarseLocationUpdate))
                     logPacket = false;
 
-                if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect))
+                if (DebugPacketLevel <= 100 && (packet.Type == PacketType.AvatarAnimation || packet.Type == PacketType.ViewerEffect))
                     logPacket = false;
                 
-                if (m_debugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate)
+                if (DebugPacketLevel <= 50 && packet.Type == PacketType.ImprovedTerseObjectUpdate)
                     logPacket = false;
 
                 if (logPacket)
@@ -11778,17 +11773,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="Pack">OpenMetaverse.packet</param>
         public void ProcessInPacket(Packet packet)
         {
-            if (m_debugPacketLevel > 0)
+            if (DebugPacketLevel > 0)
             {
                 bool outputPacket = true;
 
-                if (m_debugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate)
+                if (DebugPacketLevel <= 255 && packet.Type == PacketType.AgentUpdate)
                     outputPacket = false;
 
-                if (m_debugPacketLevel <= 200 && packet.Type == PacketType.RequestImage)
+                if (DebugPacketLevel <= 200 && packet.Type == PacketType.RequestImage)
                     outputPacket = false;
 
-                if (m_debugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation))
+                if (DebugPacketLevel <= 100 && (packet.Type == PacketType.ViewerEffect || packet.Type == PacketType.AgentAnimation))
                     outputPacket = false;
 
                 if (outputPacket)
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 7fada4b..c91744c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -466,7 +466,7 @@ namespace OpenSim.Region.Framework.Scenes
                                               scenePresence.Lastname,
                                               newDebug);
 
-                            scenePresence.ControllingClient.SetDebugPacketLevel(newDebug);
+                            scenePresence.ControllingClient.DebugPacketLevel = newDebug;
                         }
                     });
                 }
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index a3b65cf..9fa243e 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -867,10 +867,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
 #pragma warning restore 67
 
-        public void SetDebugPacketLevel(int newDebug)
-        {
-            
-        }
+        public int DebugPacketLevel { get; set; }
 
         public void InPacket(object NewPack)
         {
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index fd2b9c7..a29ed21 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -823,9 +823,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
-        public void SetDebugPacketLevel(int newDebug)
-        {
-        }
+        public int DebugPacketLevel { get; set; }
 
         public void InPacket(object NewPack)
         {