diff options
| author | UbitUmarov | 2016-11-19 15:45:41 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-19 15:45:41 +0000 |
| commit | 7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4 (patch) | |
| tree | a2ab69bce5eda122b119da082625449f92b4c3d3 /OpenSim/Framework/TaskInventoryDictionary.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | REST console v2. This is an incompatible protocol change. It degrades gracefu... (diff) | |
| download | opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.zip opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.gz opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.bz2 opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.xz | |
merge conflits
Diffstat (limited to 'OpenSim/Framework/TaskInventoryDictionary.cs')
| -rw-r--r-- | OpenSim/Framework/TaskInventoryDictionary.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs index 2c20ef7..c270d98 100644 --- a/OpenSim/Framework/TaskInventoryDictionary.cs +++ b/OpenSim/Framework/TaskInventoryDictionary.cs | |||
| @@ -64,6 +64,13 @@ namespace OpenSim.Framework | |||
| 64 | /// </value> | 64 | /// </value> |
| 65 | private volatile System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim(); | 65 | private volatile System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim(); |
| 66 | 66 | ||
| 67 | |||
| 68 | ~TaskInventoryDictionary() | ||
| 69 | { | ||
| 70 | m_itemLock.Dispose(); | ||
| 71 | m_itemLock = null; | ||
| 72 | } | ||
| 73 | |||
| 67 | /// <summary> | 74 | /// <summary> |
| 68 | /// Are we readlocked by the calling thread? | 75 | /// Are we readlocked by the calling thread? |
| 69 | /// </summary> | 76 | /// </summary> |