diff options
| author | Melanie | 2010-12-21 22:50:35 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-21 22:50:35 +0000 |
| commit | da37ddff9fdbc63884c12fcd94f9724fd32f2fa6 (patch) | |
| tree | 8ed49b037ae504bbb5cc197666ebcf24aba873c7 /OpenSim/Region | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff) | |
| parent | Added a missed return. Thanks diva! (diff) | |
| download | opensim-SC-da37ddff9fdbc63884c12fcd94f9724fd32f2fa6.zip opensim-SC-da37ddff9fdbc63884c12fcd94f9724fd32f2fa6.tar.gz opensim-SC-da37ddff9fdbc63884c12fcd94f9724fd32f2fa6.tar.bz2 opensim-SC-da37ddff9fdbc63884c12fcd94f9724fd32f2fa6.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
| -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 8ec9d55..9be7211 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -970,6 +970,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 970 | { | 970 | { |
| 971 | xferManager.AddNewFile(m_inventoryFileName, | 971 | xferManager.AddNewFile(m_inventoryFileName, |
| 972 | m_inventoryFileData); | 972 | m_inventoryFileData); |
| 973 | return; | ||
| 973 | } | 974 | } |
| 974 | } | 975 | } |
| 975 | 976 | ||