diff options
| author | unknown | 2009-12-07 18:14:02 +0100 |
|---|---|---|
| committer | unknown | 2009-12-07 18:14:02 +0100 |
| commit | dbd8c400ce9eb9177bb9d0b939405578ad9c3157 (patch) | |
| tree | 61daf67c74c14ad10147a115f7ef673c73968840 /OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |
| parent | Initial windlight codebase commit (diff) | |
| parent | Same for the remote auth connector (diff) | |
| download | opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.zip opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.gz opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.bz2 opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.xz | |
Merge branch 'careminster' into windlight
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/XEngine.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 49c69ab..184af19 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -150,7 +150,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 150 | } | 150 | } |
| 151 | else | 151 | else |
| 152 | { | 152 | { |
| 153 | m_scriptsLock.ExitReadLock(); | 153 | if (m_scriptsLock.RecursiveReadCount > 0) |
| 154 | { | ||
| 155 | m_scriptsLock.ExitReadLock(); | ||
| 156 | } | ||
| 154 | } | 157 | } |
| 155 | } | 158 | } |
| 156 | private void lockScriptsForWrite(bool locked) | 159 | private void lockScriptsForWrite(bool locked) |
| @@ -179,7 +182,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 179 | } | 182 | } |
| 180 | else | 183 | else |
| 181 | { | 184 | { |
| 182 | m_scriptsLock.ExitWriteLock(); | 185 | if (m_scriptsLock.RecursiveWriteCount > 0) |
| 186 | { | ||
| 187 | m_scriptsLock.ExitWriteLock(); | ||
| 188 | } | ||
| 183 | } | 189 | } |
| 184 | } | 190 | } |
| 185 | 191 | ||