diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 62 |
1 files changed, 12 insertions, 50 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index e0d0fe1..c8ac014 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -818,7 +818,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
818 | /// <summary></summary> | 818 | /// <summary></summary> |
819 | public Vector3 Acceleration | 819 | public Vector3 Acceleration |
820 | { | 820 | { |
821 | get { return m_acceleration; } | 821 | get |
822 | { | ||
823 | PhysicsActor actor = PhysActor; | ||
824 | if (actor != null) | ||
825 | { | ||
826 | m_acceleration = actor.Acceleration; | ||
827 | } | ||
828 | return m_acceleration; | ||
829 | } | ||
830 | |||
822 | set { m_acceleration = value; } | 831 | set { m_acceleration = value; } |
823 | } | 832 | } |
824 | 833 | ||
@@ -2696,38 +2705,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2696 | 2705 | ||
2697 | public void RotLookAt(Quaternion target, float strength, float damping) | 2706 | public void RotLookAt(Quaternion target, float strength, float damping) |
2698 | { | 2707 | { |
2699 | rotLookAt(target, strength, damping); | 2708 | m_parentGroup.rotLookAt(target, strength, damping); // This calls method in SceneObjectGroup. |
2700 | } | ||
2701 | |||
2702 | public void rotLookAt(Quaternion target, float strength, float damping) | ||
2703 | { | ||
2704 | if (IsAttachment) | ||
2705 | { | ||
2706 | /* | ||
2707 | ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar); | ||
2708 | if (avatar != null) | ||
2709 | { | ||
2710 | Rotate the Av? | ||
2711 | } */ | ||
2712 | } | ||
2713 | else | ||
2714 | { | ||
2715 | APIDDamp = damping; | ||
2716 | APIDStrength = strength; | ||
2717 | APIDTarget = target; | ||
2718 | } | ||
2719 | } | ||
2720 | |||
2721 | public void startLookAt(Quaternion rot, float damp, float strength) | ||
2722 | { | ||
2723 | APIDDamp = damp; | ||
2724 | APIDStrength = strength; | ||
2725 | APIDTarget = rot; | ||
2726 | } | ||
2727 | |||
2728 | public void stopLookAt() | ||
2729 | { | ||
2730 | APIDTarget = Quaternion.Identity; | ||
2731 | } | 2709 | } |
2732 | 2710 | ||
2733 | /// <summary> | 2711 | /// <summary> |
@@ -3225,22 +3203,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3225 | PhysActor.VehicleRotationParam(param, rotation); | 3203 | PhysActor.VehicleRotationParam(param, rotation); |
3226 | } | 3204 | } |
3227 | } | 3205 | } |
3228 | |||
3229 | public void SetVehicleFlags(int flags) | ||
3230 | { | ||
3231 | if (PhysActor != null) | ||
3232 | { | ||
3233 | PhysActor.VehicleFlagsSet(flags); | ||
3234 | } | ||
3235 | } | ||
3236 | |||
3237 | public void RemoveVehicleFlags(int flags) | ||
3238 | { | ||
3239 | if (PhysActor != null) | ||
3240 | { | ||
3241 | PhysActor.VehicleFlagsRemove(flags); | ||
3242 | } | ||
3243 | } | ||
3244 | 3206 | ||
3245 | /// <summary> | 3207 | /// <summary> |
3246 | /// Set the color of prim faces | 3208 | /// Set the color of prim faces |
@@ -3494,7 +3456,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3494 | 3456 | ||
3495 | public void StopLookAt() | 3457 | public void StopLookAt() |
3496 | { | 3458 | { |
3497 | m_parentGroup.stopLookAt(); | 3459 | m_parentGroup.stopLookAt(); // This calls method in SceneObjectGroup. |
3498 | 3460 | ||
3499 | m_parentGroup.ScheduleGroupForTerseUpdate(); | 3461 | m_parentGroup.ScheduleGroupForTerseUpdate(); |
3500 | } | 3462 | } |