diff options
author | Dr Scofield | 2009-04-22 18:09:55 +0000 |
---|---|---|
committer | Dr Scofield | 2009-04-22 18:09:55 +0000 |
commit | 7dbcf0570f0f5d521373df6d381c2d75dc2845d3 (patch) | |
tree | 63d7b2429f78b4b66e9194c5ee35476ac9b1e5e0 /OpenSim/Framework | |
parent | more cleanup (diff) | |
download | opensim-SC_OLD-7dbcf0570f0f5d521373df6d381c2d75dc2845d3.zip opensim-SC_OLD-7dbcf0570f0f5d521373df6d381c2d75dc2845d3.tar.gz opensim-SC_OLD-7dbcf0570f0f5d521373df6d381c2d75dc2845d3.tar.bz2 opensim-SC_OLD-7dbcf0570f0f5d521373df6d381c2d75dc2845d3.tar.xz |
From: Alan Webb <alan_webb@us.ibm.com>
Changes to enable script state persistence across non-restart
serialization situations (inventory/OAR/attachments)
Also fixing test cases for OAR and IAR so they don't barf with the new code.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 43d28e7..66da564 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
@@ -120,6 +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 | 124 | ||
124 | public UUID AssetID { | 125 | public UUID AssetID { |
125 | get { | 126 | get { |
@@ -220,6 +221,15 @@ namespace OpenSim.Framework | |||
220 | } | 221 | } |
221 | } | 222 | } |
222 | 223 | ||
224 | public UUID OldItemID { | ||
225 | get { | ||
226 | return _oldID; | ||
227 | } | ||
228 | set { | ||
229 | _oldID = value; | ||
230 | } | ||
231 | } | ||
232 | |||
223 | public UUID LastOwnerID { | 233 | public UUID LastOwnerID { |
224 | get { | 234 | get { |
225 | return _lastOwnerID; | 235 | return _lastOwnerID; |
@@ -327,6 +337,7 @@ namespace OpenSim.Framework | |||
327 | /// <param name="partID">The new part ID to which this item belongs</param> | 337 | /// <param name="partID">The new part ID to which this item belongs</param> |
328 | public void ResetIDs(UUID partID) | 338 | public void ResetIDs(UUID partID) |
329 | { | 339 | { |
340 | _oldID = _itemID; | ||
330 | _itemID = UUID.Random(); | 341 | _itemID = UUID.Random(); |
331 | _parentPartID = partID; | 342 | _parentPartID = partID; |
332 | _parentID = partID; | 343 | _parentID = partID; |