diff options
| author | Melanie | 2012-01-07 18:11:21 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-07 18:11:21 +0000 |
| commit | 4bf2e19898c64060f05535d21711ccb0ff2c31cd (patch) | |
| tree | 75447b09329bc66eec4191d1c02e7782cb780d67 /OpenSim/Region/ScriptEngine/Shared | |
| parent | Fix threat level setting on osNpcPlayAnimation (diff) | |
| parent | Fix threat level setting on osNpcPlayAnimation (diff) | |
| download | opensim-SC-4bf2e19898c64060f05535d21711ccb0ff2c31cd.zip opensim-SC-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.gz opensim-SC-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.bz2 opensim-SC-4bf2e19898c64060f05535d21711ccb0ff2c31cd.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 40dd4ed..8999f00 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2094,7 +2094,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2094 | 2094 | ||
| 2095 | public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard) | 2095 | public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard) |
| 2096 | { | 2096 | { |
| 2097 | CheckThreatLevel(ThreatLevel.High, "osNpcCreated"); | 2097 | CheckThreatLevel(ThreatLevel.High, "osNpcCreate"); |
| 2098 | return NpcCreate(firstname, lastname, position, notecard, false); | 2098 | return NpcCreate(firstname, lastname, position, notecard, false); |
| 2099 | } | 2099 | } |
| 2100 | 2100 | ||