aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorCharles Krinke2008-05-19 20:05:10 +0000
committerCharles Krinke2008-05-19 20:05:10 +0000
commit01b5425a2dc4e7675db9fceebc693479b37890ca (patch)
treeea94ace681983d9147f6fb5ce5cf3e2c459b06e3 /OpenSim/Region
parenti can haz pantz? (diff)
downloadopensim-SC-01b5425a2dc4e7675db9fceebc693479b37890ca.zip
opensim-SC-01b5425a2dc4e7675db9fceebc693479b37890ca.tar.gz
opensim-SC-01b5425a2dc4e7675db9fceebc693479b37890ca.tar.bz2
opensim-SC-01b5425a2dc4e7675db9fceebc693479b37890ca.tar.xz
Thank you kindly, Melanie for a patch that avoids a null
ref in inventory give and also now causes items to appear in the correct folders now, no longer in the root folder.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 0ab8779..53ae28f 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -371,7 +371,7 @@ namespace OpenSim.Region.Environment.Scenes
371 itemCopy.Name = item.Name; 371 itemCopy.Name = item.Name;
372 itemCopy.AssetType = item.AssetType; 372 itemCopy.AssetType = item.AssetType;
373 itemCopy.InvType = item.InvType; 373 itemCopy.InvType = item.InvType;
374 itemCopy.Folder = recipientUserInfo.RootFolder.ID; 374 itemCopy.Folder = LLUUID.Zero;
375 if (ExternalChecks.ExternalChecksPropagatePermissions()) 375 if (ExternalChecks.ExternalChecksPropagatePermissions())
376 { 376 {
377 if (item.InvType == 6) 377 if (item.InvType == 6)