diff options
author | Justin Clark-Casey (justincc) | 2011-09-01 01:22:28 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-01 01:22:28 +0100 |
commit | 095b3e5756bb3160b30c9c5670ba008fa13d2e66 (patch) | |
tree | 0052b92cf46d42d714740bb4c7404edbdbaea0de /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Fix a bug where the non-root parts of rezzed objects that had previously been... (diff) | |
download | opensim-SC-095b3e5756bb3160b30c9c5670ba008fa13d2e66.zip opensim-SC-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.gz opensim-SC-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.bz2 opensim-SC-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.xz |
Remove pointless cluttering SOP.ParentGroup != null checks.
The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database.
At all other times it's not possible for a SOP not to have a SOG parent.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 108089e..e40e57d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -112,15 +112,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
112 | } | 112 | } |
113 | 113 | ||
114 | /// <summary> | 114 | /// <summary> |
115 | /// Reset UUIDs for all the items in the prim's inventory. This involves either generating | 115 | /// Reset UUIDs for all the items in the prim's inventory. |
116 | /// </summary> | ||
117 | /// <remarks> | ||
118 | /// This involves either generating | ||
116 | /// new ones or setting existing UUIDs to the correct parent UUIDs. | 119 | /// new ones or setting existing UUIDs to the correct parent UUIDs. |
117 | /// | 120 | /// |
118 | /// If this method is called and there are inventory items, then we regard the inventory as having changed. | 121 | /// If this method is called and there are inventory items, then we regard the inventory as having changed. |
119 | /// </summary> | 122 | /// </remarks> |
120 | /// <param name="linkNum">Link number for the part</param> | ||
121 | public void ResetInventoryIDs() | 123 | public void ResetInventoryIDs() |
122 | { | 124 | { |
123 | if (null == m_part || null == m_part.ParentGroup) | 125 | if (null == m_part) |
124 | return; | 126 | return; |
125 | 127 | ||
126 | lock (m_items) | 128 | lock (m_items) |