aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorMelanie2010-12-21 22:50:35 +0000
committerMelanie2010-12-21 22:50:35 +0000
commitda37ddff9fdbc63884c12fcd94f9724fd32f2fa6 (patch)
tree8ed49b037ae504bbb5cc197666ebcf24aba873c7 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentMerge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff)
parentAdded a missed return. Thanks diva! (diff)
downloadopensim-SC_OLD-da37ddff9fdbc63884c12fcd94f9724fd32f2fa6.zip
opensim-SC_OLD-da37ddff9fdbc63884c12fcd94f9724fd32f2fa6.tar.gz
opensim-SC_OLD-da37ddff9fdbc63884c12fcd94f9724fd32f2fa6.tar.bz2
opensim-SC_OLD-da37ddff9fdbc63884c12fcd94f9724fd32f2fa6.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-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 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