diff options
author | Melanie | 2012-03-06 00:29:25 +0000 |
---|---|---|
committer | Melanie | 2012-03-06 00:29:25 +0000 |
commit | 5e77973667c5e1d31639d6c9cd8cc721d049d3e9 (patch) | |
tree | 7c1f743c291968f462124b98840678630dad450d /OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |
parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
parent | Updates to MSSQL store for 0.7.3 to include: (diff) | |
download | opensim-SC-5e77973667c5e1d31639d6c9cd8cc721d049d3e9.zip opensim-SC-5e77973667c5e1d31639d6c9cd8cc721d049d3e9.tar.gz opensim-SC-5e77973667c5e1d31639d6c9cd8cc721d049d3e9.tar.bz2 opensim-SC-5e77973667c5e1d31639d6c9cd8cc721d049d3e9.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLInventoryData.cs')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLInventoryData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs index 4d06377..961593f 100644 --- a/OpenSim/Data/MSSQL/MSSQLInventoryData.cs +++ b/OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |||
@@ -813,7 +813,7 @@ namespace OpenSim.Data.MSSQL | |||
813 | { | 813 | { |
814 | try | 814 | try |
815 | { | 815 | { |
816 | using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID", connection)) | 816 | using (SqlCommand command = new SqlCommand("DELETE FROM inventoryfolders WHERE folderID=@folderID and type=-1", connection)) |
817 | { | 817 | { |
818 | command.Parameters.Add(database.CreateParameter("folderID", folderID)); | 818 | command.Parameters.Add(database.CreateParameter("folderID", folderID)); |
819 | 819 | ||