diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b12eea9..1e9201e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
76 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 76 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
77 | 77 | ||
78 | private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 }; | 78 | private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 }; |
79 | private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes(); | 79 | // private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes(); |
80 | private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags)); | 80 | private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags)); |
81 | private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f); | 81 | private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f); |
82 | /// <summary> | 82 | /// <summary> |
@@ -181,7 +181,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
181 | private byte m_state; | 181 | private byte m_state; |
182 | 182 | ||
183 | //Reuse the Vector3 instead of creating a new one on the UpdateMovement method | 183 | //Reuse the Vector3 instead of creating a new one on the UpdateMovement method |
184 | private Vector3 movementvector; | 184 | // private Vector3 movementvector; |
185 | 185 | ||
186 | private bool m_autopilotMoving; | 186 | private bool m_autopilotMoving; |
187 | private Vector3 m_autoPilotTarget; | 187 | private Vector3 m_autoPilotTarget; |
@@ -2074,7 +2074,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2074 | if (heldDown) { move.Z -= 1; } | 2074 | if (heldDown) { move.Z -= 1; } |
2075 | 2075 | ||
2076 | // Is the avatar trying to move? | 2076 | // Is the avatar trying to move? |
2077 | bool moving = (move != Vector3.Zero); | 2077 | // bool moving = (move != Vector3.Zero); |
2078 | bool jumping = m_animTickJump != 0; | 2078 | bool jumping = m_animTickJump != 0; |
2079 | 2079 | ||
2080 | #endregion Inputs | 2080 | #endregion Inputs |
@@ -2326,7 +2326,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2326 | 2326 | ||
2327 | if (m_isChildAgent == false) | 2327 | if (m_isChildAgent == false) |
2328 | { | 2328 | { |
2329 | PhysicsActor actor = m_physicsActor; | 2329 | // PhysicsActor actor = m_physicsActor; |
2330 | 2330 | ||
2331 | // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to | 2331 | // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to |
2332 | // grab the latest PhysicsActor velocity, whereas m_velocity is often | 2332 | // grab the latest PhysicsActor velocity, whereas m_velocity is often |
@@ -3262,7 +3262,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3262 | Vector3 force = m_forceToApply.Value; | 3262 | Vector3 force = m_forceToApply.Value; |
3263 | 3263 | ||
3264 | m_updateflag = true; | 3264 | m_updateflag = true; |
3265 | movementvector = force; | 3265 | // movementvector = force; |
3266 | Velocity = force; | 3266 | Velocity = force; |
3267 | 3267 | ||
3268 | m_forceToApply = null; | 3268 | m_forceToApply = null; |