aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2007-12-22 14:34:05 +0000
committerJustin Clarke Casey2007-12-22 14:34:05 +0000
commite52c217e44527e966afd1cc030796e42858378bf (patch)
tree2381284536e9beb89fe6287208335ce389c4f697
parent* Masochistically updated libsecondlife.dll to r1550 (diff)
downloadopensim-SC-e52c217e44527e966afd1cc030796e42858378bf.zip
opensim-SC-e52c217e44527e966afd1cc030796e42858378bf.tar.gz
opensim-SC-e52c217e44527e966afd1cc030796e42858378bf.tar.bz2
opensim-SC-e52c217e44527e966afd1cc030796e42858378bf.tar.xz
Put in some race revealing warning messages triggered when a user rezzes a script to prim inventory
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs30
1 files changed, 30 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index ceaadc2..86cb38d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -440,6 +440,12 @@ namespace OpenSim.Region.Environment.Scenes
440 } 440 }
441 } 441 }
442 442
443 /// <summary>
444 /// Rez a script into a prim's inventory
445 /// </summary>
446 /// <param name="remoteClient"></param>
447 /// <param name="itemID"> </param>
448 /// <param name="localID"></param>
443 public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID) 449 public void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID)
444 { 450 {
445 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId); 451 CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(remoteClient.AgentId);
@@ -482,8 +488,32 @@ namespace OpenSim.Region.Environment.Scenes
482 group.AddInventoryItem(remoteClient, localID, item, copyID); 488 group.AddInventoryItem(remoteClient, localID, item, copyID);
483 group.GetProperites(remoteClient); 489 group.GetProperites(remoteClient);
484 } 490 }
491 else
492 {
493 MainLog.Instance.Warn(
494 "PRIMINVENTORY",
495 "Could not rez item {0} into prim {1}"
496 + " because the prim could not be found in the region!",
497 item.inventoryName,
498 localID);
499 }
500 }
501 else
502 {
503 MainLog.Instance.Warn(
504 "PRIMINVENTORY",
505 "Could not rez item {0} into prim {1}"
506 + " because the item asset {2} could not be found!",
507 item.inventoryName,
508 localID,
509 item.assetID);
485 } 510 }
486 } 511 }
512 else
513 {
514 MainLog.Instance.Warn(
515 "PRIMINVENTORY", "Could not find script inventory item {0} to rez!", itemID);
516 }
487 } 517 }
488 } 518 }
489 } 519 }