ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
This commit is contained in:
Melanie
2012-08-03 16:46:11 +01:00
parent ecffcf7f65 513b77b78d
commit 0c00abcce1
20 changed files with 465 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -2283,7 +2283,8 @@ namespace OpenSim.Region.Framework.Scenes
if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
sourcePart.Inventory.RemoveInventoryItem(item.ItemID);
}
group.FromPartID = sourcePart.UUID;
AddNewSceneObject(group, true, pos, rot, vel);
// We can only call this after adding the scene object, since the scene object references the scene