diff options
Diffstat (limited to 'OpenSim/Region')
4 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 587ef1c..845553a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1978,7 +1978,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1978 | forceMouselook = part.GetForceMouselook(); | 1978 | forceMouselook = part.GetForceMouselook(); |
1979 | 1979 | ||
1980 | ControllingClient.SendSitResponse( | 1980 | ControllingClient.SendSitResponse( |
1981 | targetID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); | 1981 | part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); |
1982 | 1982 | ||
1983 | m_requestedSitTargetUUID = targetID; | 1983 | m_requestedSitTargetUUID = targetID; |
1984 | 1984 | ||
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs index 58e2e4c..2945199 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |||
@@ -841,6 +841,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
841 | public override Vector3 Acceleration | 841 | public override Vector3 Acceleration |
842 | { | 842 | { |
843 | get { return _acceleration; } | 843 | get { return _acceleration; } |
844 | set { _acceleration = value; } | ||
844 | } | 845 | } |
845 | 846 | ||
846 | public void SetAcceleration(Vector3 accel) | 847 | public void SetAcceleration(Vector3 accel) |
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 5f802d0..42e22ff 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
@@ -673,6 +673,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
673 | } | 673 | } |
674 | return _acceleration; | 674 | return _acceleration; |
675 | } | 675 | } |
676 | set { _acceleration = value; } | ||
676 | } | 677 | } |
677 | 678 | ||
678 | 679 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 21c0a27..3bc8750 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7592,6 +7592,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7592 | currentPosition = GetSetPosTarget(part, v, currentPosition); | 7592 | currentPosition = GetSetPosTarget(part, v, currentPosition); |
7593 | 7593 | ||
7594 | break; | 7594 | break; |
7595 | case (int)ScriptBaseClass.PRIM_POS_LOCAL: | ||
7596 | if (remain < 1) | ||
7597 | return; | ||
7598 | |||
7599 | v=rules.GetVector3Item(idx++); | ||
7600 | positionChanged = true; | ||
7601 | currentPosition = GetSetPosTarget(part, v, currentPosition); | ||
7602 | |||
7603 | break; | ||
7595 | case (int)ScriptBaseClass.PRIM_SIZE: | 7604 | case (int)ScriptBaseClass.PRIM_SIZE: |
7596 | if (remain < 1) | 7605 | if (remain < 1) |
7597 | return; | 7606 | return; |