diff options
| author | Melanie | 2012-05-19 13:34:44 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-19 13:34:44 +0100 |
| commit | ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4 (patch) | |
| tree | 2d63da14ca345487a27f2202b2490eae0d86b60c /OpenSim/Region/ScriptEngine | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ... (diff) | |
| download | opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.zip opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.gz opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.bz2 opensim-SC_OLD-ebd9d2618bc88eafdc0bbf86c9f1755476cc68e4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 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 2533002..0cc3e8c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -10373,7 +10373,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10373 | m_host.TaskInventory.LockItemsForRead(false); | 10373 | m_host.TaskInventory.LockItemsForRead(false); |
| 10374 | 10374 | ||
| 10375 | // ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 10375 | // ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
| 10376 | ScenePresence presence = World.GetScenePresence(agentID); | 10376 | ScenePresence presence = World.GetScenePresence(m_item.PermsGranter); |
| 10377 | if (presence != null) | 10377 | if (presence != null) |
| 10378 | { | 10378 | { |
| 10379 | LSL_Vector pos = new LSL_Vector(presence.CameraPosition.X, presence.CameraPosition.Y, presence.CameraPosition.Z); | 10379 | LSL_Vector pos = new LSL_Vector(presence.CameraPosition.X, presence.CameraPosition.Y, presence.CameraPosition.Z); |
| @@ -10397,7 +10397,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 10397 | m_host.TaskInventory.LockItemsForRead(false); | 10397 | m_host.TaskInventory.LockItemsForRead(false); |
| 10398 | 10398 | ||
| 10399 | // ScenePresence presence = World.GetScenePresence(m_host.OwnerID); | 10399 | // ScenePresence presence = World.GetScenePresence(m_host.OwnerID); |
| 10400 | ScenePresence presence = World.GetScenePresence(agentID); | 10400 | ScenePresence presence = World.GetScenePresence(m_item.PermsGranter); |
| 10401 | if (presence != null) | 10401 | if (presence != null) |
| 10402 | { | 10402 | { |
| 10403 | return new LSL_Rotation(presence.CameraRotation.X, presence.CameraRotation.Y, presence.CameraRotation.Z, presence.CameraRotation.W); | 10403 | return new LSL_Rotation(presence.CameraRotation.X, presence.CameraRotation.Y, presence.CameraRotation.Z, presence.CameraRotation.W); |