aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs18
2 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4ab6fe4..b43b227 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2512,7 +2512,7 @@ namespace OpenSim.Region.Framework.Scenes
2512 if (sp == null) 2512 if (sp == null)
2513 { 2513 {
2514 m_log.DebugFormat( 2514 m_log.DebugFormat(
2515 "[SCENE]: Adding new child scene presence {0} to scene {1}", client.Name, RegionInfo.RegionName); 2515 "[SCENE]: Adding new child scene presence {0} to scene {1} at pos {2}", client.Name, RegionInfo.RegionName, client.StartPos);
2516 2516
2517 m_clientManager.Add(client); 2517 m_clientManager.Add(client);
2518 SubscribeToClientEvents(client); 2518 SubscribeToClientEvents(client);
@@ -3249,9 +3249,9 @@ namespace OpenSim.Region.Framework.Scenes
3249 3249
3250 // Don't disable this log message - it's too helpful 3250 // Don't disable this log message - it's too helpful
3251 m_log.DebugFormat( 3251 m_log.DebugFormat(
3252 "[CONNECTION BEGIN]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, teleportflags {6})", 3252 "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, teleportflags {6}, position {7})",
3253 RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname, 3253 RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname,
3254 agent.AgentID, agent.circuitcode, teleportFlags); 3254 agent.AgentID, agent.circuitcode, teleportFlags, agent.startpos);
3255 3255
3256 if (LoginsDisabled) 3256 if (LoginsDisabled)
3257 { 3257 {
@@ -3294,7 +3294,7 @@ namespace OpenSim.Region.Framework.Scenes
3294 catch (Exception e) 3294 catch (Exception e)
3295 { 3295 {
3296 m_log.ErrorFormat( 3296 m_log.ErrorFormat(
3297 "[CONNECTION BEGIN]: Exception verifying presence {0}{1}", e.Message, e.StackTrace); 3297 "[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
3298 return false; 3298 return false;
3299 } 3299 }
3300 } 3300 }
@@ -3307,12 +3307,12 @@ namespace OpenSim.Region.Framework.Scenes
3307 catch (Exception e) 3307 catch (Exception e)
3308 { 3308 {
3309 m_log.ErrorFormat( 3309 m_log.ErrorFormat(
3310 "[CONNECTION BEGIN]: Exception authorizing user {0}{1}", e.Message, e.StackTrace); 3310 "[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
3311 return false; 3311 return false;
3312 } 3312 }
3313 3313
3314 m_log.InfoFormat( 3314 m_log.InfoFormat(
3315 "[CONNECTION BEGIN]: Region {0} authenticated and authorized incoming {1} agent {2} {3} {4} (circuit code {5})", 3315 "[SCENE]: Region {0} authenticated and authorized incoming {1} agent {2} {3} {4} (circuit code {5})",
3316 RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname, 3316 RegionInfo.RegionName, (agent.child ? "child" : "root"), agent.firstname, agent.lastname,
3317 agent.AgentID, agent.circuitcode); 3317 agent.AgentID, agent.circuitcode);
3318 3318
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ac58dae..800b7e0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -502,9 +502,9 @@ namespace OpenSim.Region.Framework.Scenes
502 { 502 {
503 m_pos = PhysicsActor.Position; 503 m_pos = PhysicsActor.Position;
504 504
505// m_log.DebugFormat( 505 //m_log.DebugFormat(
506// "[SCENE PRESENCE]: Set position {0} for {1} in {2} via getting AbsolutePosition!", 506 // "[SCENE PRESENCE]: Set position {0} for {1} in {2} via getting AbsolutePosition!",
507// m_pos, Name, Scene.RegionInfo.RegionName); 507 // m_pos, Name, Scene.RegionInfo.RegionName);
508 } 508 }
509 else 509 else
510 { 510 {
@@ -534,7 +534,6 @@ namespace OpenSim.Region.Framework.Scenes
534 } 534 }
535 } 535 }
536 } 536 }
537
538 return m_pos; 537 return m_pos;
539 } 538 }
540 set 539 set
@@ -554,9 +553,9 @@ namespace OpenSim.Region.Framework.Scenes
554 m_pos = value; 553 m_pos = value;
555 ParentPosition = Vector3.Zero; 554 ParentPosition = Vector3.Zero;
556 555
557// m_log.DebugFormat( 556 //m_log.DebugFormat(
558// "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}", 557 // "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}",
559// Scene.RegionInfo.RegionName, Name, m_pos); 558 // Scene.RegionInfo.RegionName, Name, m_pos);
560 } 559 }
561 } 560 }
562 561
@@ -3006,6 +3005,7 @@ namespace OpenSim.Region.Framework.Scenes
3006 CopyFrom(cAgentData); 3005 CopyFrom(cAgentData);
3007 } 3006 }
3008 3007
3008 private static Vector3 marker = new Vector3(-1f, -1f, -1f);
3009 /// <summary> 3009 /// <summary>
3010 /// This updates important decision making data about a child agent 3010 /// This updates important decision making data about a child agent
3011 /// The main purpose is to figure out what objects to send to a child agent that's in a neighboring region 3011 /// The main purpose is to figure out what objects to send to a child agent that's in a neighboring region
@@ -3026,8 +3026,8 @@ namespace OpenSim.Region.Framework.Scenes
3026 // region's draw distance. 3026 // region's draw distance.
3027 // DrawDistance = cAgentData.Far; 3027 // DrawDistance = cAgentData.Far;
3028 DrawDistance = Scene.DefaultDrawDistance; 3028 DrawDistance = Scene.DefaultDrawDistance;
3029 3029
3030 if (cAgentData.Position != new Vector3(-1f, -1f, -1f)) // UGH!! 3030 if (cAgentData.Position != marker) // UGH!!
3031 m_pos = cAgentData.Position + offset; 3031 m_pos = cAgentData.Position + offset;
3032 3032
3033 if (Vector3.Distance(AbsolutePosition, posLastSignificantMove) >= Scene.ChildReprioritizationDistance) 3033 if (Vector3.Distance(AbsolutePosition, posLastSignificantMove) >= Scene.ChildReprioritizationDistance)