Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index ba2a306..d4bbbfb 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Framework
         private int _permsMask;
         private int _type = 0;
         private UUID _oldID;
+        private UUID _loadedID = UUID.Zero;
 
         private bool _ownerChanged = false;
 
@@ -231,6 +232,15 @@ namespace OpenSim.Framework
             }
         }
 
+        public UUID LoadedItemID {
+            get {
+                return _loadedID;
+            }
+            set {
+                _loadedID = value;
+            }
+        }
+
         public UUID LastOwnerID {
             get {
                 return _lastOwnerID;
@@ -347,6 +357,7 @@ namespace OpenSim.Framework
         /// <param name="partID">The new part ID to which this item belongs</param>
         public void ResetIDs(UUID partID)
         {
+            LoadedItemID = OldItemID;
             OldItemID = ItemID;
             ItemID = UUID.Random();
             ParentPartID = partID;