ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some crashes caused by the addition of the CreatorData column

Browse Source
This commit is contained in:
Melanie
2010-11-22 23:31:29 +01:00
parent 506192e466
commit 571becefb6
5 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Capabilities/Caps.cs
View File

@@ -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;

1
OpenSim/Framework/TaskInventoryDictionary.cs
View File

@@ -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();