aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-09-19 22:53:05 +0200
committerMelanie2010-09-19 22:53:05 +0200
commit9cf8795ecf1a2f34f803babf318d9c1f394ee18b (patch)
tree07777eb9eef06e8a1556fa4283f8e54f5df9ba2c
parentOverwrite the core version of the string parsing method with ours (diff)
downloadopensim-SC-9cf8795ecf1a2f34f803babf318d9c1f394ee18b.zip
opensim-SC-9cf8795ecf1a2f34f803babf318d9c1f394ee18b.tar.gz
opensim-SC-9cf8795ecf1a2f34f803babf318d9c1f394ee18b.tar.bz2
opensim-SC-9cf8795ecf1a2f34f803babf318d9c1f394ee18b.tar.xz
Fix a merge artefact that broke script state persistence in XAttachments
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
2 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index df5b936..883f61a 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Framework
120 private UUID _permsGranter; 120 private UUID _permsGranter;
121 private int _permsMask; 121 private int _permsMask;
122 private int _type = 0; 122 private int _type = 0;
123 private UUID _oldID; 123 private UUID _oldID = UUID.Zero;
124 124
125 private bool _ownerChanged = false; 125 private bool _ownerChanged = false;
126 126
@@ -227,9 +227,6 @@ namespace OpenSim.Framework
227 get { 227 get {
228 return _oldID; 228 return _oldID;
229 } 229 }
230 set {
231 _oldID = value;
232 }
233 } 230 }
234 231
235 public UUID LastOwnerID { 232 public UUID LastOwnerID {
@@ -348,7 +345,8 @@ namespace OpenSim.Framework
348 /// <param name="partID">The new part ID to which this item belongs</param> 345 /// <param name="partID">The new part ID to which this item belongs</param>
349 public void ResetIDs(UUID partID) 346 public void ResetIDs(UUID partID)
350 { 347 {
351 OldItemID = ItemID; 348 if (_oldID == UUID.Zero)
349 _oldID = ItemID;
352 ItemID = UUID.Random(); 350 ItemID = UUID.Random();
353 ParentPartID = partID; 351 ParentPartID = partID;
354 ParentID = partID; 352 ParentID = partID;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f9bfffd..41b0a42 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1029,7 +1029,7 @@ namespace OpenSim.Region.Framework.Scenes
1029 SceneObjectPart[] parts = m_parts.GetArray(); 1029 SceneObjectPart[] parts = m_parts.GetArray();
1030 for (int i = 0; i < parts.Length; i++) 1030 for (int i = 0; i < parts.Length; i++)
1031 { 1031 {
1032 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(); 1032 Dictionary<UUID, string> pstates = parts[i].Inventory.GetScriptStates(oldIDs);
1033 foreach (KeyValuePair<UUID, string> kvp in pstates) 1033 foreach (KeyValuePair<UUID, string> kvp in pstates)
1034 states.Add(kvp.Key, kvp.Value); 1034 states.Add(kvp.Key, kvp.Value);
1035 } 1035 }