aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2010-05-03 01:40:24 +0100
committerMelanie2010-05-03 01:40:24 +0100
commit9f8acbfe3e6206893822bc3b7edbadbd7cae7a16 (patch)
treedd9485b0c6b4cbfa0399501f43d7d70d4ed438aa /OpenSim/Region/ScriptEngine/Shared
parentMake the IUserAccountData properly unpack the god mode data, so grid gods (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.zip
opensim-SC_OLD-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.gz
opensim-SC_OLD-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.bz2
opensim-SC_OLD-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs2
1 files changed, 2 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 b3e4740..96f6486 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -549,5 +549,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
549 public const int STATS_ACTIVE_SCRIPTS = 19; 549 public const int STATS_ACTIVE_SCRIPTS = 19;
550 public const int STATS_SCRIPT_LPS = 20; 550 public const int STATS_SCRIPT_LPS = 20;
551 551
552 public const string URL_REQUEST_GRANTED = "URL_REQUEST_GRANTED";
553 public const string URL_REQUEST_DENIED = "URL_REQUEST_DENIED";
552 } 554 }
553} 555}