diff options
| author | Melanie | 2012-01-12 23:22:55 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-12 23:22:55 +0000 |
| commit | cf166d3f1e7f18819623473b9c323489f23b82cd (patch) | |
| tree | d4a68d9d5efe9c175b0e0cbf5fd75f5e3f8fe18f /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add api level test for removing an owned npc (diff) | |
| download | opensim-SC_OLD-cf166d3f1e7f18819623473b9c323489f23b82cd.zip opensim-SC_OLD-cf166d3f1e7f18819623473b9c323489f23b82cd.tar.gz opensim-SC_OLD-cf166d3f1e7f18819623473b9c323489f23b82cd.tar.bz2 opensim-SC_OLD-cf166d3f1e7f18819623473b9c323489f23b82cd.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 44aff21..25f359a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -172,6 +172,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 172 | LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules); | 172 | LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules); |
| 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 osNpcCreateOwned(string user, string name, vector position, string notecard); | 176 | key osNpcCreateOwned(string user, string name, vector position, string notecard); |
| 176 | LSL_Key osNpcSaveAppearance(key npc, string notecard); | 177 | LSL_Key osNpcSaveAppearance(key npc, string notecard); |
| 177 | void osNpcLoadAppearance(key npc, string notecard); | 178 | void osNpcLoadAppearance(key npc, string notecard); |