diff options
| author | Melanie | 2012-01-13 02:27:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-13 02:27:20 +0000 |
| commit | 9dc7fef4f6323f0e3a2ec108bff2a6da809a1a2d (patch) | |
| tree | 9f1388bdc474abf3adffa0c255bb72384a562ec6 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Fix typo (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC_OLD-9dc7fef4f6323f0e3a2ec108bff2a6da809a1a2d.zip opensim-SC_OLD-9dc7fef4f6323f0e3a2ec108bff2a6da809a1a2d.tar.gz opensim-SC_OLD-9dc7fef4f6323f0e3a2ec108bff2a6da809a1a2d.tar.bz2 opensim-SC_OLD-9dc7fef4f6323f0e3a2ec108bff2a6da809a1a2d.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, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 25f359a..403e491 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); |