diff options
author | Melanie | 2011-12-05 15:26:49 +0100 |
---|---|---|
committer | Melanie | 2011-12-05 15:26:49 +0100 |
commit | 68bdd0b7fedcfa8546e3071b32a0e8451dd8942d (patch) | |
tree | 9928dd7beb172dccc0897ffd754868c5558443dd /OpenSim/Region/ScriptEngine | |
parent | Reinstate setter for OffsetPosition to allow setting the offset by script (diff) | |
download | opensim-SC-68bdd0b7fedcfa8546e3071b32a0e8451dd8942d.zip opensim-SC-68bdd0b7fedcfa8546e3071b32a0e8451dd8942d.tar.gz opensim-SC-68bdd0b7fedcfa8546e3071b32a0e8451dd8942d.tar.bz2 opensim-SC-68bdd0b7fedcfa8546e3071b32a0e8451dd8942d.tar.xz |
Fix setting seated avatar position and make llSameGroup work as in SL.
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 7b4b653..e26aef3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6211,8 +6211,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6211 | UUID agentId = new UUID(); | 6211 | UUID agentId = new UUID(); |
6212 | if (!UUID.TryParse(agent, out agentId)) | 6212 | if (!UUID.TryParse(agent, out agentId)) |
6213 | return new LSL_Integer(0); | 6213 | return new LSL_Integer(0); |
6214 | if (agentId == m_host.GroupID) | ||
6215 | return new LSL_Integer(1); | ||
6214 | ScenePresence presence = World.GetScenePresence(agentId); | 6216 | ScenePresence presence = World.GetScenePresence(agentId); |
6215 | if (presence == null || presence.IsChildAgent) // Return flase for child agents | 6217 | if (presence == null || presence.IsChildAgent) // Return false for child agents |
6216 | return new LSL_Integer(0); | 6218 | return new LSL_Integer(0); |
6217 | IClientAPI client = presence.ControllingClient; | 6219 | IClientAPI client = presence.ControllingClient; |
6218 | if (m_host.GroupID == client.ActiveGroupId) | 6220 | if (m_host.GroupID == client.ActiveGroupId) |
@@ -7554,7 +7556,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7554 | return; | 7556 | return; |
7555 | LSL_Vector v; | 7557 | LSL_Vector v; |
7556 | v = rules.GetVector3Item(idx++); | 7558 | v = rules.GetVector3Item(idx++); |
7557 | av.AbsolutePosition = new Vector3((float)v.x, (float)v.y, (float)v.z); | 7559 | av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z); |
7558 | av.SendAvatarDataToAllAgents(); | 7560 | av.SendAvatarDataToAllAgents(); |
7559 | 7561 | ||
7560 | break; | 7562 | break; |