Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-05-07 12:07:47 +01:00
9 changed files with 22 additions and 12 deletions

View File

@@ -639,6 +639,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int OS_NPC_FLY = 0;
public const int OS_NPC_NO_FLY = 1;
public const int OS_NPC_LAND_AT_TARGET = 2;
public const int OS_NPC_RUNNING = 4;
public const int OS_NPC_SIT_NOW = 0;