diff options
author | Justin Clark-Casey (justincc) | 2010-09-07 03:41:29 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-07 03:41:29 +0100 |
commit | f7b28dd32155eac2d55ccf0757b059794d6b5f67 (patch) | |
tree | daba1307fa62acc66a74fb15ca621e32ed24c98b /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | minor: comment out some excessive test logging (diff) | |
download | opensim-SC_OLD-f7b28dd32155eac2d55ccf0757b059794d6b5f67.zip opensim-SC_OLD-f7b28dd32155eac2d55ccf0757b059794d6b5f67.tar.gz opensim-SC_OLD-f7b28dd32155eac2d55ccf0757b059794d6b5f67.tar.bz2 opensim-SC_OLD-f7b28dd32155eac2d55ccf0757b059794d6b5f67.tar.xz |
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index ca089a1..87c4860 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -119,6 +119,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
119 | /// <param name="linkNum">Link number for the part</param> | 119 | /// <param name="linkNum">Link number for the part</param> |
120 | public void ResetInventoryIDs() | 120 | public void ResetInventoryIDs() |
121 | { | 121 | { |
122 | if (null == m_part || null == m_part.ParentGroup) | ||
123 | return; | ||
124 | |||
122 | lock (m_items) | 125 | lock (m_items) |
123 | { | 126 | { |
124 | if (0 == m_items.Count) | 127 | if (0 == m_items.Count) |