aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorubit2012-08-04 11:42:59 +0200
committerubit2012-08-04 11:42:59 +0200
commitdfb77330a8f5abac2acd72db196d1020a25697c1 (patch)
tree8be49aa7fb6917cd5feeb4b7246d416bcc41d06a /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent update ode.dll for windows so both 32b and 64b are now version 0.12 (32b (diff)
downloadopensim-SC-dfb77330a8f5abac2acd72db196d1020a25697c1.zip
opensim-SC-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.gz
opensim-SC-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.bz2
opensim-SC-dfb77330a8f5abac2acd72db196d1020a25697c1.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts: bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 672d95a..0b73df5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2283,7 +2283,8 @@ namespace OpenSim.Region.Framework.Scenes
2283 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) 2283 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
2284 sourcePart.Inventory.RemoveInventoryItem(item.ItemID); 2284 sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
2285 } 2285 }
2286 2286
2287 group.FromPartID = sourcePart.UUID;
2287 AddNewSceneObject(group, true, pos, rot, vel); 2288 AddNewSceneObject(group, true, pos, rot, vel);
2288 2289
2289 // We can only call this after adding the scene object, since the scene object references the scene 2290 // We can only call this after adding the scene object, since the scene object references the scene