diff options
| author | Melanie | 2012-01-06 22:33:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-01-06 22:33:51 +0100 |
| commit | 70157a4ec53bc75ca6acf781600d4901c32ace8b (patch) | |
| tree | 3ea0215db5e02a5ae33aed83a1f8f8ac8fbc5033 /OpenSim/Region | |
| parent | Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well (diff) | |
| download | opensim-SC-70157a4ec53bc75ca6acf781600d4901c32ace8b.zip opensim-SC-70157a4ec53bc75ca6acf781600d4901c32ace8b.tar.gz opensim-SC-70157a4ec53bc75ca6acf781600d4901c32ace8b.tar.bz2 opensim-SC-70157a4ec53bc75ca6acf781600d4901c32ace8b.tar.xz | |
Fix some syntax issues
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index fe5f198..6530f14 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2359,7 +2359,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2359 | if (module != null) | 2359 | if (module != null) |
| 2360 | { | 2360 | { |
| 2361 | UUID npcID = new UUID(npc.m_string); | 2361 | UUID npcID = new UUID(npc.m_string); |
| 2362 | if (module.IsNPC(npcID)) | 2362 | if (module.IsNPC(npcID, m_host.ParentGroup.Scene)) |
| 2363 | { | 2363 | { |
| 2364 | UUID ownerID = module.GetOwner(npcID); | 2364 | UUID ownerID = module.GetOwner(npcID); |
| 2365 | if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) | 2365 | if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) |
| @@ -2376,7 +2376,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2376 | if (module != null) | 2376 | if (module != null) |
| 2377 | { | 2377 | { |
| 2378 | UUID npcID = new UUID(npc.m_string); | 2378 | UUID npcID = new UUID(npc.m_string); |
| 2379 | if (module.IsNPC(npcID)) | 2379 | if (module.IsNPC(npcID, m_host.ParentGroup.Scene)) |
| 2380 | { | 2380 | { |
| 2381 | UUID ownerID = module.GetOwner(npcID); | 2381 | UUID ownerID = module.GetOwner(npcID); |
| 2382 | if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) | 2382 | if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index e9e7605..44aff21 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -185,8 +185,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 185 | void osNpcSit(key npc, key target, int options); | 185 | void osNpcSit(key npc, key target, int options); |
| 186 | void osNpcStand(LSL_Key npc); | 186 | void osNpcStand(LSL_Key npc); |
| 187 | void osNpcRemove(key npc); | 187 | void osNpcRemove(key npc); |
| 188 | public void osNpcPlayAnimation(LSL_Key npc, string animation); | 188 | void osNpcPlayAnimation(LSL_Key npc, string animation); |
| 189 | public void osNpcStopAnimation(LSL_Key npc, string animation); | 189 | void osNpcStopAnimation(LSL_Key npc, string animation); |
| 190 | 190 | ||
| 191 | LSL_Key osOwnerSaveAppearance(string notecard); | 191 | LSL_Key osOwnerSaveAppearance(string notecard); |
| 192 | LSL_Key osAgentSaveAppearance(key agentId, string notecard); | 192 | LSL_Key osAgentSaveAppearance(key agentId, string notecard); |