aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-30 19:55:45 +0000
committerJustin Clarke Casey2008-04-30 19:55:45 +0000
commit3984a7fda1c37d5aaec7f6c7d12ce2804a0c750e (patch)
tree70aa023ffc13f029dbb73bdb9831b9951ba8dcbc /OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
parent* Add a scratch implementation of the new inventory fields to the mssql datab... (diff)
downloadopensim-SC-3984a7fda1c37d5aaec7f6c7d12ce2804a0c750e.zip
opensim-SC-3984a7fda1c37d5aaec7f6c7d12ce2804a0c750e.tar.gz
opensim-SC-3984a7fda1c37d5aaec7f6c7d12ce2804a0c750e.tar.bz2
opensim-SC-3984a7fda1c37d5aaec7f6c7d12ce2804a0c750e.tar.xz
* Resolve mantis 1068, 1095
* The resolution takes the form of not crashing the session if the folder the user is attempting to add already exists (e.g. there is one already with the same UUID). * Printing out warnings instead
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 5f532e0..f55f323 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -62,6 +62,13 @@ namespace OpenSim.Framework.Communications.Cache
62 { 62 {
63 } 63 }
64 64
65 /// <summary>
66 /// Create a new subfolder. This exists only in the cache.
67 /// </summary>
68 /// <param name="folderID"></param>
69 /// <param name="folderName"></param>
70 /// <param name="type"></param>
71 /// <returns>The newly created subfolder. Returns null if the folder already exists</returns>
65 public InventoryFolderImpl CreateNewSubFolder(LLUUID folderID, string folderName, ushort type) 72 public InventoryFolderImpl CreateNewSubFolder(LLUUID folderID, string folderName, ushort type)
66 { 73 {
67 lock (SubFolders) 74 lock (SubFolders)