diff options
| author | Kitto Flora | 2009-12-22 00:33:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2009-12-22 00:33:31 -0500 |
| commit | 93b930b9370b1439c4416c08a45fe7f23a5862c7 (patch) | |
| tree | e3546d86b64e9e2c13c4fba40a364857bfb0a8e7 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Include ChOdePlugin (diff) | |
| parent | Should not commit without compiling (diff) | |
| download | opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.zip opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.gz opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.bz2 opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.xz | |
Fix conflicts
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 1 |
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 | ||