From db558591259587bbf79c2358350385e0bbb5d286 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 4 Jan 2011 11:30:08 -0800 Subject: [PATCH 1/4] Guard against null Animator. --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 46234f9666..0648c586f6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2499,7 +2499,8 @@ namespace OpenSim.Region.Framework.Scenes // m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); avatar.ControllingClient.SendAvatarDataImmediate(this); - Animator.SendAnimPackToClient(avatar.ControllingClient); + if (Animation != null) + Animator.SendAnimPackToClient(avatar.ControllingClient); } /// From fbde9b1136e831542869e42995466dc5df101ee5 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 4 Jan 2011 11:33:15 -0800 Subject: [PATCH 2/4] Note to self: try to make only 3 things at the same time. --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0648c586f6..3a401968cc 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2499,7 +2499,7 @@ namespace OpenSim.Region.Framework.Scenes // m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); avatar.ControllingClient.SendAvatarDataImmediate(this); - if (Animation != null) + if (Animator != null) Animator.SendAnimPackToClient(avatar.ControllingClient); } From 4ac58093bf7fd89c473be259c0a6ca8524879245 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 4 Jan 2011 23:23:42 +0000 Subject: [PATCH 3/4] Make the default for the very verbose XMLRPC groups debug setting false rather than true! --- .../Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 4aab87fb3c..a8dec63def 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs @@ -123,8 +123,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups m_log.InfoFormat("[GROUPS]: Initializing {0}", this.Name); m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true); - m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); - + m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", false); } } From 0c165bc4217bdae27e3268980bdbc21809e77c12 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 5 Jan 2011 07:14:09 -0800 Subject: [PATCH 4/4] Commented a verbose Debug message in LLUDPServer that got uncommented at some point. --- OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 149ae9e350..e54cfc21ea 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -648,7 +648,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP IClientAPI client; if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView)) { - m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); + //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); return; }