diff options
Diffstat (limited to '')
-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 6c0d9f2..124f4c0 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; |
@@ -2068,7 +2068,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2068 | if (heldDown) { move.Z -= 1; } | 2068 | if (heldDown) { move.Z -= 1; } |
2069 | 2069 | ||
2070 | // Is the avatar trying to move? | 2070 | // Is the avatar trying to move? |
2071 | bool moving = (move != Vector3.Zero); | 2071 | // bool moving = (move != Vector3.Zero); |
2072 | bool jumping = m_animTickJump != 0; | 2072 | bool jumping = m_animTickJump != 0; |
2073 | 2073 | ||
2074 | #endregion Inputs | 2074 | #endregion Inputs |
@@ -2320,7 +2320,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2320 | 2320 | ||
2321 | if (m_isChildAgent == false) | 2321 | if (m_isChildAgent == false) |
2322 | { | 2322 | { |
2323 | PhysicsActor actor = m_physicsActor; | 2323 | // PhysicsActor actor = m_physicsActor; |
2324 | 2324 | ||
2325 | // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to | 2325 | // NOTE: Velocity is not the same as m_velocity. Velocity will attempt to |
2326 | // grab the latest PhysicsActor velocity, whereas m_velocity is often | 2326 | // grab the latest PhysicsActor velocity, whereas m_velocity is often |
@@ -3256,7 +3256,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3256 | Vector3 force = m_forceToApply.Value; | 3256 | Vector3 force = m_forceToApply.Value; |
3257 | 3257 | ||
3258 | m_updateflag = true; | 3258 | m_updateflag = true; |
3259 | movementvector = force; | 3259 | // movementvector = force; |
3260 | Velocity = force; | 3260 | Velocity = force; |
3261 | 3261 | ||
3262 | m_forceToApply = null; | 3262 | m_forceToApply = null; |