OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
avinationmerge
Melanie 2012-02-02 01:53:13 +00:00
parent 45ad9e39a6 567f4c51f8
commit dbc3f1ff92
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/TaskInventoryItem.cs
View File

@ -64,7 +64,7 @@ namespace OpenSim.Framework
private UUID _permsGranter; private UUID _permsGranter;
private int _permsMask; private int _permsMask;
private int _type = 0; private int _type = 0;
private UUID _oldID = UUID.Zero; private UUID _oldID;
private UUID _loadedID = UUID.Zero; private UUID _loadedID = UUID.Zero;
private bool _ownerChanged = false; private bool _ownerChanged = false;
@ -369,8 +369,8 @@ namespace OpenSim.Framework
/// <param name="partID">The new part ID to which this item belongs</param> /// <param name="partID">The new part ID to which this item belongs</param>
public void ResetIDs(UUID partID) public void ResetIDs(UUID partID)
{ {
_loadedID = _oldID; LoadedItemID = OldItemID;
_oldID = ItemID; OldItemID = ItemID;
ItemID = UUID.Random(); ItemID = UUID.Random();
ParentPartID = partID; ParentPartID = partID;
ParentID = partID; ParentID = partID;