diff options
author | Justin Clark-Casey (justincc) | 2012-01-25 23:22:07 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-01-25 23:22:07 +0000 |
commit | 2de3a1b9dad25855cb18a29f2c43ad67cfb0730c (patch) | |
tree | 426bd46a79ddf1ad8f37937364e2fcfd2ce3a14a /OpenSim/Region/ScriptEngine/Shared | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-2de3a1b9dad25855cb18a29f2c43ad67cfb0730c.zip opensim-SC_OLD-2de3a1b9dad25855cb18a29f2c43ad67cfb0730c.tar.gz opensim-SC_OLD-2de3a1b9dad25855cb18a29f2c43ad67cfb0730c.tar.bz2 opensim-SC_OLD-2de3a1b9dad25855cb18a29f2c43ad67cfb0730c.tar.xz |
refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), RezNewScript() and rename one RezScript() to RezScriptFromPrim()
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 330c65d..6fa812d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6603,7 +6603,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6603 | } | 6603 | } |
6604 | 6604 | ||
6605 | // the rest of the permission checks are done in RezScript, so check the pin there as well | 6605 | // the rest of the permission checks are done in RezScript, so check the pin there as well |
6606 | World.RezScript(srcId, m_host, destId, pin, running, start_param); | 6606 | World.RezScriptFromPrim(srcId, m_host, destId, pin, running, start_param); |
6607 | |||
6607 | // this will cause the delay even if the script pin or permissions were wrong - seems ok | 6608 | // this will cause the delay even if the script pin or permissions were wrong - seems ok |
6608 | ScriptSleep(3000); | 6609 | ScriptSleep(3000); |
6609 | } | 6610 | } |