From ccbe04928731575503fbcccad3bb2bd7ba0bde4f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 5 Jun 2009 19:34:35 +0000
Subject: * A bug fix for the last mantis 3741 bugfix * Hopefully now, the nre
 should not occur and the lock should be correctly unlocked during the initial
 save oar process

---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 0bb7fff..725c54f 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -156,16 +156,18 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 catch (Exception e)
                 {
-                    m_log.ErrorFormat("[ASSET GATHERER]: Failed to get part - {0}", e);
-                    m_log.DebugFormat("[ASSET GATHERER]: Texture entry length for prim was {0} (min is 46)", part.Shape.TextureEntry.Length);
+                    m_log.ErrorFormat("[UUID GATHERER]: Failed to get part - {0}", e);
+                    m_log.DebugFormat(
+                        "[UUID GATHERER]: Texture entry length for prim was {0} (min is 46)", 
+                        part.Shape.TextureEntry.Length);
                 }
             }
-        }         
+        }
         
         /// <summary>
         /// The callback made when we request the asset for an object from the asset service.
-        /// </summary>
-        protected void AssetRequestCallback(UUID assetID, AssetBase asset)
+        /// </summary>        
+        protected void AssetReceived(string id, Object sender, AssetBase asset)
         {
             lock (this)
             {
@@ -175,11 +177,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        protected void AssetReceived(string id, Object sender, AssetBase asset)
-        {
-            AssetRequestCallback(asset.FullID, asset);
-        }
-
         /// <summary>
         /// Get an asset synchronously, potentially using an asynchronous callback.  If the
         /// asynchronous callback is used, we will wait for it to complete.
-- 
cgit v1.1