OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some syntax issues

avinationmerge
Melanie 2012-01-06 22:33:51 +01:00
parent a47aa46962
commit 70157a4ec5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2359,7 +2359,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (module != null) if (module != null)
{ {
UUID npcID = new UUID(npc.m_string); UUID npcID = new UUID(npc.m_string);
if (module.IsNPC(npcID)) if (module.IsNPC(npcID, m_host.ParentGroup.Scene))
{ {
UUID ownerID = module.GetOwner(npcID); UUID ownerID = module.GetOwner(npcID);
if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) if (ownerID == UUID.Zero || ownerID == m_host.OwnerID)
@ -2376,7 +2376,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (module != null) if (module != null)
{ {
UUID npcID = new UUID(npc.m_string); UUID npcID = new UUID(npc.m_string);
if (module.IsNPC(npcID)) if (module.IsNPC(npcID, m_host.ParentGroup.Scene))
{ {
UUID ownerID = module.GetOwner(npcID); UUID ownerID = module.GetOwner(npcID);
if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) if (ownerID == UUID.Zero || ownerID == m_host.OwnerID)

4
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -185,8 +185,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osNpcSit(key npc, key target, int options); void osNpcSit(key npc, key target, int options);
void osNpcStand(LSL_Key npc); void osNpcStand(LSL_Key npc);
void osNpcRemove(key npc); void osNpcRemove(key npc);
public void osNpcPlayAnimation(LSL_Key npc, string animation); void osNpcPlayAnimation(LSL_Key npc, string animation);
public void osNpcStopAnimation(LSL_Key npc, string animation); void osNpcStopAnimation(LSL_Key npc, string animation);
LSL_Key osOwnerSaveAppearance(string notecard); LSL_Key osOwnerSaveAppearance(string notecard);
LSL_Key osAgentSaveAppearance(key agentId, string notecard); LSL_Key osAgentSaveAppearance(key agentId, string notecard);