diff options
author | Justin Clark-Casey (justincc) | 2012-01-13 00:00:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-13 00:00:18 +0000 |
commit | 6e7154d55c4b5ab8dacd2bcbce3b5408470b7f48 (patch) | |
tree | 579b6671f0233274ce601cece958e46b04488c52 | |
parent | Add missing assert to confirm owner delete succeeded to the end of TestOsNpcR... (diff) | |
download | opensim-SC_OLD-6e7154d55c4b5ab8dacd2bcbce3b5408470b7f48.zip opensim-SC_OLD-6e7154d55c4b5ab8dacd2bcbce3b5408470b7f48.tar.gz opensim-SC_OLD-6e7154d55c4b5ab8dacd2bcbce3b5408470b7f48.tar.bz2 opensim-SC_OLD-6e7154d55c4b5ab8dacd2bcbce3b5408470b7f48.tar.xz |
Removing osNpcCreateOwned(). Please use osNpcCreate(string user, string name, vector position, string notecard, int options) instead with option OS_NPC_CREATOR_OWNED
Please note that correct option name is OS_NPC_CREATOR_OWNED not OS_NPC_CREATE_OWNED as mistakenly put in a previous commit.
3 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 25e4789..2c35f58 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2077,12 +2077,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2077 | return retVal; | 2077 | return retVal; |
2078 | } | 2078 | } |
2079 | 2079 | ||
2080 | public LSL_Key osNpcCreateOwned(string firstname, string lastname, LSL_Vector position, string notecard) | ||
2081 | { | ||
2082 | CheckThreatLevel(ThreatLevel.High, "osNpcCreateOwned"); | ||
2083 | return NpcCreate(firstname, lastname, position, notecard, true); | ||
2084 | } | ||
2085 | |||
2086 | public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard) | 2080 | public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard) |
2087 | { | 2081 | { |
2088 | CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); | 2082 | CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index ddfc20d..af6be5f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -173,7 +173,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
173 | 173 | ||
174 | key osNpcCreate(string user, string name, vector position, string notecard); | 174 | key osNpcCreate(string user, string name, vector position, string notecard); |
175 | key osNpcCreate(string user, string name, vector position, string notecard, int options); | 175 | key osNpcCreate(string user, string name, vector position, string notecard, int options); |
176 | key osNpcCreateOwned(string user, string name, vector position, string notecard); | ||
177 | LSL_Key osNpcSaveAppearance(key npc, string notecard); | 176 | LSL_Key osNpcSaveAppearance(key npc, string notecard); |
178 | void osNpcLoadAppearance(key npc, string notecard); | 177 | void osNpcLoadAppearance(key npc, string notecard); |
179 | vector osNpcGetPos(key npc); | 178 | vector osNpcGetPos(key npc); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index ceccceb..0c05ea4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -493,11 +493,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
493 | return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom, options); | 493 | return m_OSSL_Functions.osNpcCreate(user, name, position, cloneFrom, options); |
494 | } | 494 | } |
495 | 495 | ||
496 | public key osNpcCreateOwned(string user, string name, vector position, key cloneFrom) | ||
497 | { | ||
498 | return m_OSSL_Functions.osNpcCreateOwned(user, name, position, cloneFrom); | ||
499 | } | ||
500 | |||
501 | public key osNpcSaveAppearance(key npc, string notecard) | 496 | public key osNpcSaveAppearance(key npc, string notecard) |
502 | { | 497 | { |
503 | return m_OSSL_Functions.osNpcSaveAppearance(npc, notecard); | 498 | return m_OSSL_Functions.osNpcSaveAppearance(npc, notecard); |