diff options
author | SignpostMarv | 2012-08-02 11:19:33 +0100 |
---|---|---|
committer | Melanie | 2012-08-02 22:12:36 +0100 |
commit | cd2c5843a86af5b6b49b6675e90b702b479fd258 (patch) | |
tree | 6e4983737c77e2de1d1da2005776ef0974f4dbc6 /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-cd2c5843a86af5b6b49b6675e90b702b479fd258.zip opensim-SC-cd2c5843a86af5b6b49b6675e90b702b479fd258.tar.gz opensim-SC-cd2c5843a86af5b6b49b6675e90b702b479fd258.tar.bz2 opensim-SC-cd2c5843a86af5b6b49b6675e90b702b479fd258.tar.xz |
reduced-complexity implementation of function to get rezzing object key
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
2 files changed, 10 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 |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 52469a2..c9345e5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -611,6 +611,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
611 | public UUID FromItemID { get; set; } | 611 | public UUID FromItemID { get; set; } |
612 | 612 | ||
613 | /// <summary> | 613 | /// <summary> |
614 | /// Refers to the SceneObjectPart.UUID property of the object that this object was rezzed from, if applicable. | ||
615 | /// </summary> | ||
616 | /// <remarks> | ||
617 | /// If not applicable will be UUID.Zero | ||
618 | /// </remarks> | ||
619 | public UUID RezzingObjectID { get; set; } | ||
620 | |||
621 | /// <summary> | ||
614 | /// The folder ID that this object was rezzed from, if applicable. | 622 | /// The folder ID that this object was rezzed from, if applicable. |
615 | /// </summary> | 623 | /// </summary> |
616 | /// <remarks> | 624 | /// <remarks> |