aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-01-08 12:08:34 +0100
committerMelanie2013-01-08 12:08:34 +0100
commitd1fa650c3f16ee74cd39d9258c5ef7aa4869ca03 (patch)
tree97c45190f602bc9d3b92a265532e88ed2e4ab71a
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC_OLD-d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.zip
opensim-SC_OLD-d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.tar.gz
opensim-SC_OLD-d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.tar.bz2
opensim-SC_OLD-d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.tar.xz
Remove sending AvatarData because this also happens on login, where it chokes
Firestorm, Singularity and other viewers with the new appearance pipeline.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4504e18..b6407d2 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -140,8 +140,6 @@ 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
145 143
146 private Vector3? m_forceToApply; 144 private Vector3? m_forceToApply;
147 private int m_userFlags; 145 private int m_userFlags;
@@ -2525,13 +2523,7 @@ namespace OpenSim.Region.Framework.Scenes
2525 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to 2523 // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to
2526 // grab the latest PhysicsActor velocity, whereas m_velocity is often 2524 // grab the latest PhysicsActor velocity, whereas m_velocity is often
2527 // storing a requested force instead of an actual traveling velocity 2525 // storing a requested force instead of an actual traveling velocity
2528 if (Appearance.AvatarSize != m_lastSize) 2526 if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
2529 {
2530 m_lastSize = Appearance.AvatarSize;
2531 SendAvatarDataToAllAgents();
2532 }
2533
2534 else if (!Rotation.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
2535 !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) || 2527 !Velocity.ApproxEquals(m_lastVelocity, VELOCITY_TOLERANCE) ||
2536 !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE)) 2528 !m_pos.ApproxEquals(m_lastPosition, POSITION_TOLERANCE))
2537 { 2529 {