aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-06-05 19:34:35 +0000
committerJustin Clarke Casey2009-06-05 19:34:35 +0000
commitccbe04928731575503fbcccad3bb2bd7ba0bde4f (patch)
tree8d4f70f8b5b14f651545fe005314439b965b1949
parent* A further fix for mantis 3641 (oar saves do not complete) (diff)
downloadopensim-SC_OLD-ccbe04928731575503fbcccad3bb2bd7ba0bde4f.zip
opensim-SC_OLD-ccbe04928731575503fbcccad3bb2bd7ba0bde4f.tar.gz
opensim-SC_OLD-ccbe04928731575503fbcccad3bb2bd7ba0bde4f.tar.bz2
opensim-SC_OLD-ccbe04928731575503fbcccad3bb2bd7ba0bde4f.tar.xz
* 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
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs17
1 files changed, 7 insertions, 10 deletions
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
156 } 156 }
157 catch (Exception e) 157 catch (Exception e)
158 { 158 {
159 m_log.ErrorFormat("[ASSET GATHERER]: Failed to get part - {0}", e); 159 m_log.ErrorFormat("[UUID GATHERER]: Failed to get part - {0}", e);
160 m_log.DebugFormat("[ASSET GATHERER]: Texture entry length for prim was {0} (min is 46)", part.Shape.TextureEntry.Length); 160 m_log.DebugFormat(
161 "[UUID GATHERER]: Texture entry length for prim was {0} (min is 46)",
162 part.Shape.TextureEntry.Length);
161 } 163 }
162 } 164 }
163 } 165 }
164 166
165 /// <summary> 167 /// <summary>
166 /// The callback made when we request the asset for an object from the asset service. 168 /// The callback made when we request the asset for an object from the asset service.
167 /// </summary> 169 /// </summary>
168 protected void AssetRequestCallback(UUID assetID, AssetBase asset) 170 protected void AssetReceived(string id, Object sender, AssetBase asset)
169 { 171 {
170 lock (this) 172 lock (this)
171 { 173 {
@@ -175,11 +177,6 @@ namespace OpenSim.Region.Framework.Scenes
175 } 177 }
176 } 178 }
177 179
178 protected void AssetReceived(string id, Object sender, AssetBase asset)
179 {
180 AssetRequestCallback(asset.FullID, asset);
181 }
182
183 /// <summary> 180 /// <summary>
184 /// Get an asset synchronously, potentially using an asynchronous callback. If the 181 /// Get an asset synchronously, potentially using an asynchronous callback. If the
185 /// asynchronous callback is used, we will wait for it to complete. 182 /// asynchronous callback is used, we will wait for it to complete.