aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-01-16 20:27:12 +0000
committerJustin Clarke Casey2008-01-16 20:27:12 +0000
commitb33da2538ed728bdc97cca20ada36913097160b0 (patch)
tree0464763a340891a49134d7bd66468302bc38dcad /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parent* Fixed a packet counting issue that I introduced (diff)
downloadopensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.zip
opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.gz
opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.bz2
opensim-SC_OLD-b33da2538ed728bdc97cca20ada36913097160b0.tar.xz
* Fix mantis 345 - it is now possible to duplicate prims directly in the region again without breakage
* This includes their inventories * Also, this revision properly synchronizes prim inventory crud.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 93073c1..7866739 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -952,10 +952,10 @@ namespace OpenSim.Region.Environment.Scenes
952 #region Copying 952 #region Copying
953 953
954 /// <summary> 954 /// <summary>
955 /// 955 /// Duplicates this part.
956 /// </summary> 956 /// </summary>
957 /// <returns></returns> 957 /// <returns></returns>
958 public SceneObjectPart Copy(uint localID, LLUUID AgentID, LLUUID GroupID) 958 public SceneObjectPart Copy(uint localID, LLUUID AgentID, LLUUID GroupID, int linkNum)
959 { 959 {
960 SceneObjectPart dupe = (SceneObjectPart) MemberwiseClone(); 960 SceneObjectPart dupe = (SceneObjectPart) MemberwiseClone();
961 dupe.m_shape = m_shape.Copy(); 961 dupe.m_shape = m_shape.Copy();
@@ -977,6 +977,10 @@ namespace OpenSim.Region.Environment.Scenes
977 dupe.ObjectSaleType = ObjectSaleType; 977 dupe.ObjectSaleType = ObjectSaleType;
978 dupe.SalePrice = SalePrice; 978 dupe.SalePrice = SalePrice;
979 dupe.Category = Category; 979 dupe.Category = Category;
980
981 dupe.TaskInventory = (TaskInventoryDictionary)dupe.TaskInventory.Clone();
982
983 dupe.ResetIDs(linkNum);
980 984
981 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. 985 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
982 dupe.LastOwnerID = ObjectOwner; 986 dupe.LastOwnerID = ObjectOwner;