diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index e87bb04..a214935 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2641,18 +2641,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2641 | { | 2641 | { |
2642 | UUID npcId; | 2642 | UUID npcId; |
2643 | if (!UUID.TryParse(npc.m_string, out npcId)) | 2643 | if (!UUID.TryParse(npc.m_string, out npcId)) |
2644 | return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W); | 2644 | return new LSL_Rotation(Quaternion.Identity); |
2645 | 2645 | ||
2646 | if (!npcModule.CheckPermissions(npcId, m_host.OwnerID)) | 2646 | if (!npcModule.CheckPermissions(npcId, m_host.OwnerID)) |
2647 | return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W); | 2647 | return new LSL_Rotation(Quaternion.Identity); |
2648 | 2648 | ||
2649 | ScenePresence sp = World.GetScenePresence(npcId); | 2649 | ScenePresence sp = World.GetScenePresence(npcId); |
2650 | 2650 | ||
2651 | if (sp != null) | 2651 | if (sp != null) |
2652 | { | 2652 | return new LSL_Rotation(sp.GetWorldRotation()); |
2653 | Quaternion rot = sp.Rotation; | ||
2654 | return new LSL_Rotation(rot.X, rot.Y, rot.Z, rot.W); | ||
2655 | } | ||
2656 | } | 2653 | } |
2657 | 2654 | ||
2658 | return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W); | 2655 | return new LSL_Rotation(Quaternion.Identity.X, Quaternion.Identity.Y, Quaternion.Identity.Z, Quaternion.Identity.W); |