diff options
| author | Melanie | 2012-08-03 16:48:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-03 16:48:06 +0100 |
| commit | eb4c092cac88869c02f9d857753bb92c34ab044c (patch) | |
| tree | 2766a3a537a82968f16a4e6259028b8969092fac /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Make WaitGetScenePresence wait for up to 20 seconds (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-eb4c092cac88869c02f9d857753bb92c34ab044c.zip opensim-SC-eb4c092cac88869c02f9d857753bb92c34ab044c.tar.gz opensim-SC-eb4c092cac88869c02f9d857753bb92c34ab044c.tar.bz2 opensim-SC-eb4c092cac88869c02f9d857753bb92c34ab044c.tar.xz | |
Merge branch 'careminster' into avination
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 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 |