Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2010-07-01 21:27:07 +01:00 · 2010-07-01 21:27:07 +01:00 · 12b70ffc7e
parent eb30b60e52 8326f36cda
commit 12b70ffc7e
1 changed files with 5 additions and 0 deletions
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@ -488,6 +488,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine

            if (stateSource == (int)StateSource.ScriptedRez)
            {
+                lock (m_CompileDict)
+                {
+                    m_CompileDict[itemID] = 0;
+                }
+
                DoOnRezScript(parms);
            }
            else