aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2013-01-08 13:11:04 +0100
committerMelanie2013-01-08 13:11:04 +0100
commit09d41f4f7892b2d40b692f0cdd451fea07ad0cf0 (patch)
treee646ea46003ffdeb9f5ae58df7fd4668b3c02002 /OpenSim/Region/Framework
parentMerge branch 'teravuswork' into avination (diff)
downloadopensim-SC_OLD-09d41f4f7892b2d40b692f0cdd451fea07ad0cf0.zip
opensim-SC_OLD-09d41f4f7892b2d40b692f0cdd451fea07ad0cf0.tar.gz
opensim-SC_OLD-09d41f4f7892b2d40b692f0cdd451fea07ad0cf0.tar.bz2
opensim-SC_OLD-09d41f4f7892b2d40b692f0cdd451fea07ad0cf0.tar.xz
Revert "Remove sending AvatarData because this also happens on login, where it chokes"
This reverts commit d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index be3a39a..cdba282 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -140,6 +140,8 @@ namespace OpenSim.Region.Framework.Scenes
140 private Vector3 m_lastPosition; 140 private Vector3 m_lastPosition;
141 private Quaternion m_lastRotation; 141 private Quaternion m_lastRotation;
142 private Vector3 m_lastVelocity; 142 private Vector3 m_lastVelocity;
143 private Vector3 m_lastSize = new Vector3(0.45f,0.6f,1.9f);
144
143 145
144 private Vector3? m_forceToApply; 146 private Vector3? m_forceToApply;
145 private int m_userFlags; 147 private int m_userFlags;
@@ -2539,7 +2541,13 @@ namespace OpenSim.Region.Framework.Scenes
2539 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to 2541 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
2540 // grab the latest PhysicsActor velocity, whereas m_velocity is often 2542 // grab the latest PhysicsActor velocity, whereas m_velocity is often
2541 // storing a requested force instead of an actual traveling velocity 2543 // storing a requested force instead of an actual traveling velocity
2542 if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || 2544 if (Appearance.AvatarSize != m_lastSize)
2545 {
2546 m_lastSize = Appearance.AvatarSize;
2547 SendAvatarDataToAllAgents();
2548 }
2549
2550 else if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
2543 !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) || 2551 !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
2544 !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE)) 2552 !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
2545 { 2553 {