ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
This commit is contained in:
Melanie
2012-05-19 13:34:44 +01:00
parent b4cd8b491b 3f2a727b6d
commit ebd9d2618b
15 changed files with 385 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -10373,7 +10373,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.TaskInventory.LockItemsForRead(false);
// ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
ScenePresence presence = World.GetScenePresence(agentID);
ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence != null)
{
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
m_host.TaskInventory.LockItemsForRead(false);
// ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
ScenePresence presence = World.GetScenePresence(agentID);
ScenePresence presence = World.GetScenePresence(m_item.PermsGranter);
if (presence != null)
{
return new LSL_Rotation(presence.CameraRotation.X, presence.CameraRotation.Y, presence.CameraRotation.Z, presence.CameraRotation.W);