aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
3 files changed, 13 insertions, 2 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
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 08c7a58..d51281d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.ComponentModel;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.Drawing; 31using System.Drawing;
31using System.IO; 32using System.IO;
@@ -911,6 +912,14 @@ namespace OpenSim.Region.Framework.Scenes
911 public UUID FromItemID { get; set; } 912 public UUID FromItemID { get; set; }
912 913
913 /// <summary> 914 /// <summary>
915 /// Refers to the SceneObjectPart.UUID property of the object that this object was rezzed from, if applicable.
916 /// </summary>
917 /// <remarks>
918 /// If not applicable will be UUID.Zero
919 /// </remarks>
920 public UUID FromPartID { get; set; }
921
922 /// <summary>
914 /// The folder ID that this object was rezzed from, if applicable. 923 /// The folder ID that this object was rezzed from, if applicable.
915 /// </summary> 924 /// </summary>
916 /// <remarks> 925 /// <remarks>
@@ -941,6 +950,7 @@ namespace OpenSim.Region.Framework.Scenes
941 /// The original SceneObjectPart will be used rather than a copy, preserving 950 /// The original SceneObjectPart will be used rather than a copy, preserving
942 /// its existing localID and UUID. 951 /// its existing localID and UUID.
943 /// </summary> 952 /// </summary>
953 /// <param name='part'>Root part for this scene object.</param>
944 public SceneObjectGroup(SceneObjectPart part) 954 public SceneObjectGroup(SceneObjectPart part)
945 { 955 {
946 SetRootPart(part); 956 SetRootPart(part);
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index bd11cde..ce652b4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3081,7 +3081,7 @@ namespace OpenSim.Region.Framework.Scenes
3081 3081
3082 /// <summary> 3082 /// <summary>
3083 /// Schedule a terse update for this prim. Terse updates only send position, 3083 /// Schedule a terse update for this prim. Terse updates only send position,
3084 /// rotation, velocity, rotational velocity and shape information. 3084 /// rotation, velocity and rotational velocity information.
3085 /// </summary> 3085 /// </summary>
3086 public void ScheduleTerseUpdate() 3086 public void ScheduleTerseUpdate()
3087 { 3087 {