From 571becefb652869fa844188cadf8aca1fea774ab Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 22 Nov 2010 23:31:29 +0100
Subject: Fix some crashes caused by the addition of the CreatorData column

---
 OpenSim/Framework/Capabilities/Caps.cs       | 1 +
 OpenSim/Framework/TaskInventoryDictionary.cs | 1 +
 2 files changed, 2 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 7b0e053..e7f2e13 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -967,6 +967,7 @@ namespace OpenSim.Framework.Capabilities
             InventoryItemBase item = new InventoryItemBase();
             item.Owner = m_agentID;
             item.CreatorId = m_agentID.ToString();
+            item.CreatorData = String.Empty;
             item.ID = inventoryItem;
             item.AssetID = asset.FullID;
             item.Description = assetDescription;
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index a8a53f2..940e567 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -151,6 +151,7 @@ namespace OpenSim.Framework
                 while (!m_itemLock.TryEnterWriteLock(60000))
                 {
                     m_log.Error("Thread lock detected while trying to aquire WRITE 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.");
+                    System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
                     if (m_itemLock.IsWriteLockHeld)
                     {
                         m_itemLock = new System.Threading.ReaderWriterLockSlim();
-- 
cgit v1.1