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/Runtime | |
| 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/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 |
1 files changed, 0 insertions, 5 deletions
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); |