diff options
| author | Melanie | 2012-05-15 21:24:27 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-15 21:24:27 +0100 |
| commit | 81ce169dfe4c498d6fda7bb2393bfec56065affc (patch) | |
| tree | f7ceaf7d145aaf3fa263933bbad847ef42a93c50 /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coeren... (diff) | |
| download | opensim-SC-81ce169dfe4c498d6fda7bb2393bfec56065affc.zip opensim-SC-81ce169dfe4c498d6fda7bb2393bfec56065affc.tar.gz opensim-SC-81ce169dfe4c498d6fda7bb2393bfec56065affc.tar.bz2 opensim-SC-81ce169dfe4c498d6fda7bb2393bfec56065affc.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8072e72..c7e59ac 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -10366,7 +10366,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10366 | } | 10366 | } |
| 10367 | m_host.TaskInventory.LockItemsForRead(false); | 10367 | m_host.TaskInventory.LockItemsForRead(false); |
| 10368 | 10368 | ||
| 10369 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 10369 | // ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
| 10370 | ScenePresence presence = World.GetScenePresence(agentID); | ||
| 10370 | if (presence != null) | 10371 | if (presence != null) |
| 10371 | { | 10372 | { |
| 10372 | LSL_Vector pos = new LSL_Vector(presence.CameraPosition.X, presence.CameraPosition.Y, presence.CameraPosition.Z); | 10373 | LSL_Vector pos = new LSL_Vector(presence.CameraPosition.X, presence.CameraPosition.Y, presence.CameraPosition.Z); |
| @@ -10389,7 +10390,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10389 | } | 10390 | } |
| 10390 | m_host.TaskInventory.LockItemsForRead(false); | 10391 | m_host.TaskInventory.LockItemsForRead(false); |
| 10391 | 10392 | ||
| 10392 | ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 10393 | // ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
| 10394 | ScenePresence presence = World.GetScenePresence(agentID); | ||
| 10393 | if (presence != null) | 10395 | if (presence != null) |
| 10394 | { | 10396 | { |
| 10395 | return new LSL_Rotation(presence.CameraRotation.X, presence.CameraRotation.Y, presence.CameraRotation.Z, presence.CameraRotation.W); | 10397 | return new LSL_Rotation(presence.CameraRotation.X, presence.CameraRotation.Y, presence.CameraRotation.Z, presence.CameraRotation.W); |