diff options
| author | Melanie | 2012-01-28 01:01:23 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-28 01:01:23 +0000 |
| commit | 428407c5e409f0734ce909d5db9b1114a92cba35 (patch) | |
| tree | b1fc56efd4d8f9251811bfdb3df434534787b1c8 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove IClientAPI from the money module. It was only used to pass in the (diff) | |
| download | opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.zip opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.tar.gz opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.tar.bz2 opensim-SC_OLD-428407c5e409f0734ce909d5db9b1114a92cba35.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/LSL_Constants.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 11a8883..9489957 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
| @@ -619,6 +619,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 619 | 619 | ||
| 620 | public const int OS_NPC_CREATOR_OWNED = 0x1; | 620 | public const int OS_NPC_CREATOR_OWNED = 0x1; |
| 621 | public const int OS_NPC_NOT_OWNED = 0x2; | 621 | public const int OS_NPC_NOT_OWNED = 0x2; |
| 622 | public const int OS_NPC_SENSE_AS_AGENT = 0x4; | ||
| 622 | 623 | ||
| 623 | public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; | 624 | public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; |
| 624 | public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; | 625 | public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; |