diff options
author | meta7 | 2010-09-15 07:59:28 -0700 |
---|---|---|
committer | meta7 | 2010-09-15 07:59:28 -0700 |
commit | 1f74f013b23a8bbcc94d79aa57d35e1929b662d6 (patch) | |
tree | b4a33f22a36b6bba05c9786f293d6b8b51951dc4 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Fix the above (diff) | |
download | opensim-SC-1f74f013b23a8bbcc94d79aa57d35e1929b662d6.zip opensim-SC-1f74f013b23a8bbcc94d79aa57d35e1929b662d6.tar.gz opensim-SC-1f74f013b23a8bbcc94d79aa57d35e1929b662d6.tar.bz2 opensim-SC-1f74f013b23a8bbcc94d79aa57d35e1929b662d6.tar.xz |
Don't fart when deserializing a prim with no ParentGroup set yet
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 2de439b..a9a5c8a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -132,7 +132,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
132 | } | 132 | } |
133 | 133 | ||
134 | HasInventoryChanged = true; | 134 | HasInventoryChanged = true; |
135 | m_part.ParentGroup.HasGroupChanged = true; | 135 | if (m_part.ParentGroup != null) |
136 | { | ||
137 | m_part.ParentGroup.HasGroupChanged = true; | ||
138 | } | ||
139 | |||
136 | IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); | 140 | IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); |
137 | Items.Clear(); | 141 | Items.Clear(); |
138 | 142 | ||