diff options
| author | UbitUmarov | 2012-03-09 03:00:31 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-03-09 03:00:31 +0000 |
| commit | fc4dc7708dc07dc41791de64d7a6b2586d3170b5 (patch) | |
| tree | 2b807fd97cdef06e671b52f3e735b849b05f9cfc /OpenSim/Data/MSSQL/MSSQLInventoryData.cs | |
| parent | more changes on undo/redo group scaling seems to work better (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-fc4dc7708dc07dc41791de64d7a6b2586d3170b5.zip opensim-SC-fc4dc7708dc07dc41791de64d7a6b2586d3170b5.tar.gz opensim-SC-fc4dc7708dc07dc41791de64d7a6b2586d3170b5.tar.bz2 opensim-SC-fc4dc7708dc07dc41791de64d7a6b2586d3170b5.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
| -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 | ||