diff options
| author | Justin Clark-Casey (justincc) | 2012-08-02 23:54:32 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-02 23:54:32 +0100 |
| commit | 0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81 (patch) | |
| tree | 88d593f56cbaca2c2ba796d87d91f3b5c17c22de /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Add simple draw test for the VectorRenderModule (diff) | |
| parent | Initialize the Rezzing object to UUID.Zero (diff) | |
| download | opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.zip opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.gz opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.bz2 opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 |
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 d18fffd..a2016da 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2131,7 +2131,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2131 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) | 2131 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) |
| 2132 | sourcePart.Inventory.RemoveInventoryItem(item.ItemID); | 2132 | sourcePart.Inventory.RemoveInventoryItem(item.ItemID); |
| 2133 | } | 2133 | } |
| 2134 | 2134 | ||
| 2135 | group.RezzingObjectID = sourcePart.UUID; | ||
| 2135 | AddNewSceneObject(group, true, pos, rot, vel); | 2136 | AddNewSceneObject(group, true, pos, rot, vel); |
| 2136 | 2137 | ||
| 2137 | // We can only call this after adding the scene object, since the scene object references the scene | 2138 | // We can only call this after adding the scene object, since the scene object references the scene |