Fix setting seated avatar position and make llSameGroup work as in SL.

avinationmerge
Melanie 2011-12-05 15:26:49 +01:00
parent 35800d6a86
commit 68bdd0b7fe
1 changed files with 4 additions and 2 deletions

View File

@ -6211,8 +6211,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
UUID agentId = new UUID(); UUID agentId = new UUID();
if (!UUID.TryParse(agent, out agentId)) if (!UUID.TryParse(agent, out agentId))
return new LSL_Integer(0); return new LSL_Integer(0);
if (agentId == m_host.GroupID)
return new LSL_Integer(1);
ScenePresence presence = World.GetScenePresence(agentId); ScenePresence presence = World.GetScenePresence(agentId);
if (presence == null || presence.IsChildAgent) // Return flase for child agents if (presence == null || presence.IsChildAgent) // Return false for child agents
return new LSL_Integer(0); return new LSL_Integer(0);
IClientAPI client = presence.ControllingClient; IClientAPI client = presence.ControllingClient;
if (m_host.GroupID == client.ActiveGroupId) if (m_host.GroupID == client.ActiveGroupId)
@ -7554,7 +7556,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
LSL_Vector v; LSL_Vector v;
v = rules.GetVector3Item(idx++); v = rules.GetVector3Item(idx++);
av.AbsolutePosition = new Vector3((float)v.x, (float)v.y, (float)v.z); av.OffsetPosition = new Vector3((float)v.x, (float)v.y, (float)v.z);
av.SendAvatarDataToAllAgents(); av.SendAvatarDataToAllAgents();
break; break;