diff options
| author | Justin Clark-Casey (justincc) | 2010-07-13 23:36:56 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-13 23:36:56 +0100 |
| commit | b2ef5658b1ab7b60b696d52a2d92edeeca12be07 (patch) | |
| tree | 6431ebb9293f027891afcc84e2895a8ec635e0f5 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | replace o with ; in oXmlRpcPort in OpenSim.ini.example (diff) | |
| parent | llVecNorm() now returns a zero-length vector when one is supplied as input. A... (diff) | |
| download | opensim-SC-b2ef5658b1ab7b60b696d52a2d92edeeca12be07.zip opensim-SC-b2ef5658b1ab7b60b696d52a2d92edeeca12be07.tar.gz opensim-SC-b2ef5658b1ab7b60b696d52a2d92edeeca12be07.tar.bz2 opensim-SC-b2ef5658b1ab7b60b696d52a2d92edeeca12be07.tar.xz | |
Merge branch '0.6.9-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.6.9-post-fixes
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index f702e65..73ef570 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 |