aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs37
1 files changed, 14 insertions, 23 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index f840845..c811966 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -283,6 +283,13 @@ namespace OpenSim.Region.Environment.Scenes
283 isTexture = true; 283 isTexture = true;
284 } 284 }
285 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, isTexture); 285 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
286
287 if (rezAsset == null)
288 {
289 // lets try once more in case the asset cache is being slow getting the asset from server
290 rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
291 }
292
286 if (rezAsset != null) 293 if (rezAsset != null)
287 { 294 {
288 string script = Util.FieldToString(rezAsset.Data); 295 string script = Util.FieldToString(rezAsset.Data);
@@ -290,18 +297,6 @@ namespace OpenSim.Region.Environment.Scenes
290 EventManager.TriggerRezScript(localID, copyID, script); 297 EventManager.TriggerRezScript(localID, copyID, script);
291 rezzed = true; 298 rezzed = true;
292 } 299 }
293 else
294 {
295 //lets try once more incase the asset cache is being slow getting the asset from server
296 rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
297 if (rezAsset != null)
298 {
299 string script = Util.FieldToString(rezAsset.Data);
300 // Console.WriteLine("rez script " + script);
301 EventManager.TriggerRezScript(localID, copyID, script);
302 rezzed = true;
303 }
304 }
305 300
306 if (rezzed) 301 if (rezzed)
307 { 302 {
@@ -418,23 +413,19 @@ namespace OpenSim.Region.Environment.Scenes
418 if (item != null) 413 if (item != null)
419 { 414 {
420 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, false); 415 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, false);
416
417 if (rezAsset == null)
418 {
419 // lets try once more in case the asset cache is being slow getting the asset from server
420 rezAsset = AssetCache.GetAsset(item.assetID, false);
421 }
422
421 if (rezAsset != null) 423 if (rezAsset != null)
422 { 424 {
423 AddRezObject(Util.FieldToString(rezAsset.Data), pos); 425 AddRezObject(Util.FieldToString(rezAsset.Data), pos);
424 userInfo.DeleteItem(remoteClient.AgentId, item); 426 userInfo.DeleteItem(remoteClient.AgentId, item);
425 remoteClient.SendRemoveInventoryItem(itemID); 427 remoteClient.SendRemoveInventoryItem(itemID);
426 } 428 }
427 else
428 {
429 //lets try once more incase the asset cache is being slow getting the asset from server
430 rezAsset = AssetCache.GetAsset(item.assetID, false);
431 if (rezAsset != null)
432 {
433 AddRezObject(Util.FieldToString(rezAsset.Data), pos);
434 userInfo.DeleteItem(remoteClient.AgentId, item);
435 remoteClient.SendRemoveInventoryItem(itemID);
436 }
437 }
438 } 429 }
439 } 430 }
440 } 431 }