aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-02-27 19:47:37 +0000
committerMelanie2011-02-27 19:47:37 +0000
commit9b277b372be4e1071c02f87a53cb70a4324d77fa (patch)
tree35183674cbacc79f2931a9cc11f747974fff845b /OpenSim/Region/Framework/Scenes
parentFix a few little things (diff)
parentchange some log messages from info to debug (diff)
downloadopensim-SC-9b277b372be4e1071c02f87a53cb70a4324d77fa.zip
opensim-SC-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.gz
opensim-SC-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.bz2
opensim-SC-9b277b372be4e1071c02f87a53cb70a4324d77fa.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2e116a2..fe111ff 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3342,7 +3342,7 @@ namespace OpenSim.Region.Framework.Scenes
3342 // TeleportFlags.ViaLandmark | TeleportFlags.ViaLocation | TeleportFlags.ViaLandmark | TeleportFlags.Default - Regular Teleport 3342 // TeleportFlags.ViaLandmark | TeleportFlags.ViaLocation | TeleportFlags.ViaLandmark | TeleportFlags.Default - Regular Teleport
3343 3343
3344 // Don't disable this log message - it's too helpful 3344 // Don't disable this log message - it's too helpful
3345 m_log.InfoFormat( 3345 m_log.DebugFormat(
3346 "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, teleportflags {6})", 3346 "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, teleportflags {6})",
3347 RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname, 3347 RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname,
3348 agent.AgentID, agent.circuitcode, teleportFlags); 3348 agent.AgentID, agent.circuitcode, teleportFlags);
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 92fe2ab..e8cf4f4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -218,9 +218,10 @@ namespace OpenSim.Region.Framework.Scenes
218 for (int i = 0; i < Math.Min(presences.Count, maxLocations); ++i) 218 for (int i = 0; i < Math.Min(presences.Count, maxLocations); ++i)
219 { 219 {
220 ScenePresence sp = presences[i]; 220 ScenePresence sp = presences[i];
221
221 // If this presence is a child agent, we don't want its coarse locations 222 // If this presence is a child agent, we don't want its coarse locations
222 if (sp.IsChildAgent) 223 if (sp.IsChildAgent)
223 return; 224 continue;
224 225
225 if (sp.ParentID != 0) 226 if (sp.ParentID != 0)
226 { 227 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e7056ba..6267797 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2818,7 +2818,7 @@ namespace OpenSim.Region.Framework.Scenes
2818 // If we are using the the cached appearance then send it out to everyone 2818 // If we are using the the cached appearance then send it out to everyone
2819 if (cachedappearance) 2819 if (cachedappearance)
2820 { 2820 {
2821 m_log.InfoFormat("[SCENEPRESENCE]: baked textures are in the cache for {0}", Name); 2821 m_log.DebugFormat("[SCENEPRESENCE]: baked textures are in the cache for {0}", Name);
2822 2822
2823 // If the avatars baked textures are all in the cache, then we have a 2823 // If the avatars baked textures are all in the cache, then we have a
2824 // complete appearance... send it out, if not, then we'll send it when 2824 // complete appearance... send it out, if not, then we'll send it when