aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-23 11:14:19 +0000
committerJustin Clarke Casey2008-04-23 11:14:19 +0000
commit41f9bbc26dbdca23cc7cf93a7d650b3779ac0b37 (patch)
tree93fa9cbca10060c0bd07e2e9f4d1096b6842c279
parent* Removing old libTerrainBSD and associated Plugin & Project. (diff)
downloadopensim-SC-41f9bbc26dbdca23cc7cf93a7d650b3779ac0b37.zip
opensim-SC-41f9bbc26dbdca23cc7cf93a7d650b3779ac0b37.tar.gz
opensim-SC-41f9bbc26dbdca23cc7cf93a7d650b3779ac0b37.tar.bz2
opensim-SC-41f9bbc26dbdca23cc7cf93a7d650b3779ac0b37.tar.xz
* Fix mantis #842 - folders which are created but left named "New Folder" in places other than directly under "My Inventory" should now be stored
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs15
1 files changed, 14 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index f9835f6..e3f6815 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -160,6 +160,9 @@ namespace OpenSim.Framework.Communications.Cache
160 public void HandleCreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, 160 public void HandleCreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType,
161 string folderName, LLUUID parentID) 161 string folderName, LLUUID parentID)
162 { 162 {
163// m_log.DebugFormat(
164// "[AGENT INVENTORY]: Creating inventory folder {0} {1} for {2} {3}", folderID, folderName, remoteClient.Name, remoteClient.AgentId);
165
163 CachedUserInfo userProfile; 166 CachedUserInfo userProfile;
164 167
165 if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile)) 168 if (m_userProfiles.TryGetValue(remoteClient.AgentId, out userProfile))
@@ -188,7 +191,17 @@ namespace OpenSim.Framework.Communications.Cache
188 InventoryFolderImpl folder = userProfile.RootFolder.HasSubFolder(parentID); 191 InventoryFolderImpl folder = userProfile.RootFolder.HasSubFolder(parentID);
189 if (folder != null) 192 if (folder != null)
190 { 193 {
191 folder.CreateNewSubFolder(folderID, folderName, folderType); 194 InventoryFolderImpl createdFolder = folder.CreateNewSubFolder(folderID, folderName, folderType);
195
196 InventoryFolderBase createdBaseFolder = new InventoryFolderBase();
197 createdBaseFolder.Owner = createdFolder.Owner;
198 createdBaseFolder.ID = createdFolder.ID;
199 createdBaseFolder.Name = createdFolder.Name;
200 createdBaseFolder.ParentID = createdFolder.ParentID;
201 createdBaseFolder.Type = createdFolder.Type;
202 createdBaseFolder.Version = createdFolder.Version;
203
204 m_commsManager.InventoryService.AddNewInventoryFolder(remoteClient.AgentId, createdBaseFolder);
192 } 205 }
193 } 206 }
194 } 207 }