diff options
author | John Hurliman | 2010-09-16 17:31:24 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-16 17:31:24 -0700 |
commit | 5321e0e69f5813b03748155193b0833f28c532ec (patch) | |
tree | c51d4cc760056928e97a56b09b170259b0b9e5fd /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA... (diff) | |
parent | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} (diff) | |
download | opensim-SC_OLD-5321e0e69f5813b03748155193b0833f28c532ec.zip opensim-SC_OLD-5321e0e69f5813b03748155193b0833f28c532ec.tar.gz opensim-SC_OLD-5321e0e69f5813b03748155193b0833f28c532ec.tar.bz2 opensim-SC_OLD-5321e0e69f5813b03748155193b0833f28c532ec.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 024bdc9..95cd26f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -500,7 +500,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
500 | 500 | ||
501 | // This is necessary so that TaskInventoryItem parent ids correctly reference the new uuid of this part | 501 | // This is necessary so that TaskInventoryItem parent ids correctly reference the new uuid of this part |
502 | if (Inventory != null) | 502 | if (Inventory != null) |
503 | Inventory.ResetInventoryIDs(); | 503 | Inventory.ResetObjectID(); |
504 | } | 504 | } |
505 | } | 505 | } |
506 | 506 | ||
@@ -2763,6 +2763,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2763 | UUID = UUID.Random(); | 2763 | UUID = UUID.Random(); |
2764 | LinkNum = linkNum; | 2764 | LinkNum = linkNum; |
2765 | LocalId = 0; | 2765 | LocalId = 0; |
2766 | Inventory.ResetInventoryIDs(); | ||
2766 | } | 2767 | } |
2767 | 2768 | ||
2768 | /// <summary> | 2769 | /// <summary> |