aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMic Bowman2011-01-05 15:01:53 -0800
committerMic Bowman2011-01-05 15:01:53 -0800
commitd3ebf64369253593f190fd3b2668ef6958beeb23 (patch)
tree7db44ce4a4e6145471c0f1e039f664f3131310d9
parentcomment out a couple simian debug messages (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-d3ebf64369253593f190fd3b2668ef6958beeb23.zip
opensim-SC_OLD-d3ebf64369253593f190fd3b2668ef6958beeb23.tar.gz
opensim-SC_OLD-d3ebf64369253593f190fd3b2668ef6958beeb23.tar.bz2
opensim-SC_OLD-d3ebf64369253593f190fd3b2668ef6958beeb23.tar.xz
Merge branch 'master' into cmickeyb
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs3
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 149ae9e..e54cfc2 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -648,7 +648,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
648 IClientAPI client; 648 IClientAPI client;
649 if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView)) 649 if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView))
650 { 650 {
651 m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName); 651 //m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
652 return; 652 return;
653 } 653 }
654 654
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 46234f9..3a40196 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2499,7 +2499,8 @@ namespace OpenSim.Region.Framework.Scenes
2499// m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); 2499// m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId);
2500 2500
2501 avatar.ControllingClient.SendAvatarDataImmediate(this); 2501 avatar.ControllingClient.SendAvatarDataImmediate(this);
2502 Animator.SendAnimPackToClient(avatar.ControllingClient); 2502 if (Animator != null)
2503 Animator.SendAnimPackToClient(avatar.ControllingClient);
2503 } 2504 }
2504 2505
2505 /// <summary> 2506 /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 4aab87f..a8dec63 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
123 m_log.InfoFormat("[GROUPS]: Initializing {0}", this.Name); 123 m_log.InfoFormat("[GROUPS]: Initializing {0}", this.Name);
124 124
125 m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true); 125 m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true);
126 m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); 126 m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", false);
127
128 } 127 }
129 } 128 }
130 129