diff options
author | Diva Canto | 2011-12-16 08:59:33 -0800 |
---|---|---|
committer | Diva Canto | 2011-12-16 08:59:33 -0800 |
commit | 3bf699ad36081c9c53ee6845a5c85a3a1856b923 (patch) | |
tree | 1a64887ed71e111d95434aad7b67e26134dce560 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | HG minor bug fix and marked one method obsolete in UAS. (diff) | |
download | opensim-SC_OLD-3bf699ad36081c9c53ee6845a5c85a3a1856b923.zip opensim-SC_OLD-3bf699ad36081c9c53ee6845a5c85a3a1856b923.tar.gz opensim-SC_OLD-3bf699ad36081c9c53ee6845a5c85a3a1856b923.tar.bz2 opensim-SC_OLD-3bf699ad36081c9c53ee6845a5c85a3a1856b923.tar.xz |
No functional changes. Changed the prefix of that log message [CONNECTION BEGIN] to [SCENE] because that's where the message happens.
Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 18 |
1 files changed, 9 insertions, 9 deletions
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) |