aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-06-30 21:25:39 +0100
committerMelanie2010-06-30 21:25:39 +0100
commit1db2921782c4d16e3a1be09de3ef499094d947f2 (patch)
treeaeb3c5c1edc61916deefdc592ae08a862e1c75c9 /OpenSim
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-1db2921782c4d16e3a1be09de3ef499094d947f2.zip
opensim-SC-1db2921782c4d16e3a1be09de3ef499094d947f2.tar.gz
opensim-SC-1db2921782c4d16e3a1be09de3ef499094d947f2.tar.bz2
opensim-SC-1db2921782c4d16e3a1be09de3ef499094d947f2.tar.xz
Fix scripts in rezzed objects not starting (Mantis #4775)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 4715690..808cf82 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -488,6 +488,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
488 488
489 if (stateSource == (int)StateSource.ScriptedRez) 489 if (stateSource == (int)StateSource.ScriptedRez)
490 { 490 {
491 lock (m_CompileDict)
492 {
493 m_CompileDict[itemID] = 0;
494 }
495
491 DoOnRezScript(parms); 496 DoOnRezScript(parms);
492 } 497 }
493 else 498 else