Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-01-07 18:11:21 +00:00
4 changed files with 24 additions and 22 deletions

View File

@@ -2094,7 +2094,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Key osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard)
{
CheckThreatLevel(ThreatLevel.High, "osNpcCreated");
CheckThreatLevel(ThreatLevel.High, "osNpcCreate");
return NpcCreate(firstname, lastname, position, notecard, false);
}