diff options
| author | Justin Clark-Casey (justincc) | 2010-07-01 21:27:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-01 21:27:07 +0100 |
| commit | 12b70ffc7ee164b5a2eeef2aefb8508be6316cf2 (patch) | |
| tree | 1924f401f1fb62c2253d0a3f37834e6a9e3b4972 /OpenSim | |
| parent | minor: comment out high volume texture serving module debug message (diff) | |
| parent | minor: comment out high volume texture serving module debug message (diff) | |
| download | opensim-SC_OLD-12b70ffc7ee164b5a2eeef2aefb8508be6316cf2.zip opensim-SC_OLD-12b70ffc7ee164b5a2eeef2aefb8508be6316cf2.tar.gz opensim-SC_OLD-12b70ffc7ee164b5a2eeef2aefb8508be6316cf2.tar.bz2 opensim-SC_OLD-12b70ffc7ee164b5a2eeef2aefb8508be6316cf2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -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 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 |