aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorMelanie2010-11-22 23:31:29 +0100
committerMelanie2010-11-22 23:31:29 +0100
commit571becefb652869fa844188cadf8aca1fea774ab (patch)
tree1768fee146ca42ba24b7576fb4db134ca2185e38 /OpenSim/Region/CoreModules/Framework
parentMake an invalud key string in llTextBox and llDialog non fatal to avoid (diff)
downloadopensim-SC-571becefb652869fa844188cadf8aca1fea774ab.zip
opensim-SC-571becefb652869fa844188cadf8aca1fea774ab.tar.gz
opensim-SC-571becefb652869fa844188cadf8aca1fea774ab.tar.bz2
opensim-SC-571becefb652869fa844188cadf8aca1fea774ab.tar.xz
Fix some crashes caused by the addition of the CreatorData column
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 2e3db48..22da665 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -436,9 +436,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
436 item = new InventoryItemBase(); 436 item = new InventoryItemBase();
437 // Can't know creator is the same, so null it in inventory 437 // Can't know creator is the same, so null it in inventory
438 if (objlist.Count > 1) 438 if (objlist.Count > 1)
439 {
439 item.CreatorId = UUID.Zero.ToString(); 440 item.CreatorId = UUID.Zero.ToString();
441 item.CreatorData = String.Empty;
442 }
440 else 443 else
444 {
441 item.CreatorId = objlist[0].RootPart.CreatorID.ToString(); 445 item.CreatorId = objlist[0].RootPart.CreatorID.ToString();
446 item.CreatorData = objlist[0].RootPart.CreatorData;
447 }
442 item.ID = UUID.Random(); 448 item.ID = UUID.Random();
443 item.InvType = (int)InventoryType.Object; 449 item.InvType = (int)InventoryType.Object;
444 item.Folder = folder.ID; 450 item.Folder = folder.ID;