aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2009-12-21 22:07:22 +0000
committerMelanie2009-12-21 22:07:22 +0000
commit84a1a0a72990ceea746055466f9cd1bef0ce01ad (patch)
tree4ce06ee7545cafebd375cbf68f74df29f5582b00 /OpenSim/Region/Framework
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-84a1a0a72990ceea746055466f9cd1bef0ce01ad.zip
opensim-SC_OLD-84a1a0a72990ceea746055466f9cd1bef0ce01ad.tar.gz
opensim-SC_OLD-84a1a0a72990ceea746055466f9cd1bef0ce01ad.tar.bz2
opensim-SC_OLD-84a1a0a72990ceea746055466f9cd1bef0ce01ad.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 0321c41..cdd23bd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -345,6 +345,7 @@ namespace OpenSim.Region.Framework.Scenes
345 break; 345 break;
346 } 346 }
347 } 347 }
348 m_part.ParentGroup.m_savedScriptState.Remove(oldID);
348 } 349 }
349 } 350 }
350 351