diff options
author | Teravus Ovares (Dan Olivares) | 2010-05-02 20:45:01 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2010-05-02 20:45:01 -0400 |
commit | d6bfc490f786e508b5ffa3813a90de3f8b7665ec (patch) | |
tree | c73564488f0aafcbe71c5e7751119bc0c91d549b | |
parent | * Untested Suggestion from lkalif to change (diff) | |
parent | Add URL_REQUEST_* script constants (diff) | |
download | opensim-SC_OLD-d6bfc490f786e508b5ffa3813a90de3f8b7665ec.zip opensim-SC_OLD-d6bfc490f786e508b5ffa3813a90de3f8b7665ec.tar.gz opensim-SC_OLD-d6bfc490f786e508b5ffa3813a90de3f8b7665ec.tar.bz2 opensim-SC_OLD-d6bfc490f786e508b5ffa3813a90de3f8b7665ec.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
-rw-r--r-- | LICENSE.txt | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index a004cad..570f732 100644 --- a/LICENSE.txt +++ b/LICENSE.txt | |||
@@ -1,4 +1,4 @@ | |||
1 | Copyright (c) Contributors, http://opensimulator.org/ | 1 | Copyright (c) Contributors, http://opensimulator.org/ |
2 | See CONTRIBUTORS.TXT for a full list of copyright holders. | 2 | See CONTRIBUTORS.TXT for a full list of copyright holders. |
3 | 3 | ||
4 | Redistribution and use in source and binary forms, with or without | 4 | Redistribution and use in source and binary forms, with or without |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index ee35fa4..dba6502 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -548,5 +548,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
548 | public const int STATS_ACTIVE_SCRIPTS = 19; | 548 | public const int STATS_ACTIVE_SCRIPTS = 19; |
549 | public const int STATS_SCRIPT_LPS = 20; | 549 | public const int STATS_SCRIPT_LPS = 20; |
550 | 550 | ||
551 | public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED"; | ||
552 | public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED"; | ||
551 | } | 553 | } |
552 | } | 554 | } |