diff options
| author | Melanie | 2012-02-02 01:53:13 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-02 01:53:13 +0000 |
| commit | dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d (patch) | |
| tree | c068a3475149cb2bd721da21a3eeb63f2b78cb5e /OpenSim | |
| parent | Improve reliability of script state saving by covering various saving (diff) | |
| parent | Improve reliability of script state saving by covering various saving (diff) | |
| download | opensim-SC-dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d.zip opensim-SC-dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d.tar.gz opensim-SC-dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d.tar.bz2 opensim-SC-dbc3f1ff92874c5da0cf99c5bff0beeddb06a41d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 5d8b8be..7ef8bf7 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
| @@ -64,7 +64,7 @@ namespace OpenSim.Framework | |||
| 64 | private UUID _permsGranter; | 64 | private UUID _permsGranter; |
| 65 | private int _permsMask; | 65 | private int _permsMask; |
| 66 | private int _type = 0; | 66 | private int _type = 0; |
| 67 | private UUID _oldID = UUID.Zero; | 67 | private UUID _oldID; |
| 68 | private UUID _loadedID = UUID.Zero; | 68 | private UUID _loadedID = UUID.Zero; |
| 69 | 69 | ||
| 70 | private bool _ownerChanged = false; | 70 | private bool _ownerChanged = false; |
| @@ -369,8 +369,8 @@ namespace OpenSim.Framework | |||
| 369 | /// <param name="partID">The new part ID to which this item belongs</param> | 369 | /// <param name="partID">The new part ID to which this item belongs</param> |
| 370 | public void ResetIDs(UUID partID) | 370 | public void ResetIDs(UUID partID) |
| 371 | { | 371 | { |
| 372 | _loadedID = _oldID; | 372 | LoadedItemID = OldItemID; |
| 373 | _oldID = ItemID; | 373 | OldItemID = ItemID; |
| 374 | ItemID = UUID.Random(); | 374 | ItemID = UUID.Random(); |
| 375 | ParentPartID = partID; | 375 | ParentPartID = partID; |
| 376 | ParentID = partID; | 376 | ParentID = partID; |