diff options
| author | Melanie | 2012-08-18 19:01:05 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-18 19:01:05 +0100 |
| commit | 914f97cb761842b9e5627adde78fe36eccc753bd (patch) | |
| tree | e1eebb8ebd92ee8019f7bfd9262d88501e5aaf38 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | integrating redundant code into operator (diff) | |
| download | opensim-SC_OLD-914f97cb761842b9e5627adde78fe36eccc753bd.zip opensim-SC_OLD-914f97cb761842b9e5627adde78fe36eccc753bd.tar.gz opensim-SC_OLD-914f97cb761842b9e5627adde78fe36eccc753bd.tar.bz2 opensim-SC_OLD-914f97cb761842b9e5627adde78fe36eccc753bd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 321d1d8..37766fb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2565,7 +2565,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2565 | ScenePresence sp = World.GetScenePresence(npcId); | 2565 | ScenePresence sp = World.GetScenePresence(npcId); |
| 2566 | 2566 | ||
| 2567 | if (sp != null) | 2567 | if (sp != null) |
| 2568 | sp.Rotation = LSL_Api.Rot2Quaternion(rotation); | 2568 | sp.Rotation = rotation; |
| 2569 | } | 2569 | } |
| 2570 | } | 2570 | } |
| 2571 | 2571 | ||