Attempt to fix mantis issue # 65, seems like it is a race condition between two regions trying to add a user to the AssetTransactionManager at the same time. So have placed a lock around the Dictionary add.

1 files changed, 7 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
index 55b255a..cbf63ca 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
@@ -49,11 +49,14 @@ namespace OpenSim.Framework.Communications.Cache
         // Methods
         public AgentAssetTransactions AddUser(LLUUID userID)
         {
-            if (!AgentTransactions.ContainsKey(userID))
+            lock (AgentTransactions)
             {
-                AgentAssetTransactions transactions = new AgentAssetTransactions(userID, this, m_dumpAssetsToFile);
-                AgentTransactions.Add(userID, transactions);
-                return transactions;
+                if (!AgentTransactions.ContainsKey(userID))
+                {
+                    AgentAssetTransactions transactions = new AgentAssetTransactions(userID, this, m_dumpAssetsToFile);
+                    AgentTransactions.Add(userID, transactions);
+                    return transactions;
+                }
             }
             return null;
         }