Merge commit '79c13cd99728f09a5175dff1750dcb9d7790fcdc' into bigmerge
commit
5c09cffe55
|
@ -603,7 +603,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
public const int OS_NPC_NO_FLY = 1;
|
public const int OS_NPC_NO_FLY = 1;
|
||||||
public const int OS_NPC_LAND_AT_TARGET = 2;
|
public const int OS_NPC_LAND_AT_TARGET = 2;
|
||||||
|
|
||||||
public const int OS_NPC_SIT_IMMEDIATE = 0;
|
public const int OS_NPC_SIT_NOW = 0;
|
||||||
|
|
||||||
public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
|
public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
|
||||||
public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
|
public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
|
||||||
|
|
Loading…
Reference in New Issue