diff options
| author | Melanie | 2012-01-06 22:33:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-01-06 23:08:18 +0000 |
| commit | 679d155a397567765d142e793a68679957866a6f (patch) | |
| tree | 83773212cd4cc04312e3639966e002158050d96d | |
| parent | Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well (diff) | |
| download | opensim-SC-679d155a397567765d142e793a68679957866a6f.zip opensim-SC-679d155a397567765d142e793a68679957866a6f.tar.gz opensim-SC-679d155a397567765d142e793a68679957866a6f.tar.bz2 opensim-SC-679d155a397567765d142e793a68679957866a6f.tar.xz | |
Fix some syntax issues
| -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 efb77ae..b3477ac 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2350,7 +2350,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2350 | if (module != null) | 2350 | if (module != null) |
| 2351 | { | 2351 | { |
| 2352 | UUID npcID = new UUID(npc.m_string); | 2352 | UUID npcID = new UUID(npc.m_string); |
| 2353 | if (module.IsNPC(npcID)) | 2353 | if (module.IsNPC(npcID, m_host.ParentGroup.Scene)) |
| 2354 | { | 2354 | { |
| 2355 | UUID ownerID = module.GetOwner(npcID); | 2355 | UUID ownerID = module.GetOwner(npcID); |
| 2356 | if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) | 2356 | if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) |
| @@ -2367,7 +2367,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2367 | if (module != null) | 2367 | if (module != null) |
| 2368 | { | 2368 | { |
| 2369 | UUID npcID = new UUID(npc.m_string); | 2369 | UUID npcID = new UUID(npc.m_string); |
| 2370 | if (module.IsNPC(npcID)) | 2370 | if (module.IsNPC(npcID, m_host.ParentGroup.Scene)) |
| 2371 | { | 2371 | { |
| 2372 | UUID ownerID = module.GetOwner(npcID); | 2372 | UUID ownerID = module.GetOwner(npcID); |
| 2373 | if (ownerID == UUID.Zero || ownerID == m_host.OwnerID) | 2373 | 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 d5e085d..f92f51f 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); |