aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/TaskInventoryDictionary.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/TaskInventoryDictionary.cs')
-rw-r--r--OpenSim/Framework/TaskInventoryDictionary.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index c270d98..223d91f 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework
52 52
53 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem)); 53 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
55 55
56 private Thread LockedByThread; 56 private Thread LockedByThread;
57// private string WriterStack; 57// private string WriterStack;
58 58
@@ -98,7 +98,7 @@ namespace OpenSim.Framework
98 if (!LockedByThread.IsAlive) 98 if (!LockedByThread.IsAlive)
99 { 99 {
100 //Locked by dead thread, reset. 100 //Locked by dead thread, reset.
101 m_itemLock = new System.Threading.ReaderWriterLockSlim(); 101 m_itemLock = new System.Threading.ReaderWriterLockSlim();
102 } 102 }
103 } 103 }
104 104
@@ -146,7 +146,7 @@ namespace OpenSim.Framework
146// {} 146// {}
147 m_itemLock.ExitWriteLock(); 147 m_itemLock.ExitWriteLock();
148 } 148 }
149 149
150 while (!m_itemLock.TryEnterReadLock(60000)) 150 while (!m_itemLock.TryEnterReadLock(60000))
151 { 151 {
152 m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed."); 152 m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");