aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorCharles Krinke2008-06-26 02:46:29 +0000
committerCharles Krinke2008-06-26 02:46:29 +0000
commit1cd6b71b60d093b451ba03881ee31efd3eb29a50 (patch)
tree71e51114e772d9d9121a449a684e9c7f8a8e5a16 /OpenSim/Framework
parentMinor refactoring of POS. Adds a Util.Clamp(x, min, max) function. (diff)
downloadopensim-SC_OLD-1cd6b71b60d093b451ba03881ee31efd3eb29a50.zip
opensim-SC_OLD-1cd6b71b60d093b451ba03881ee31efd3eb29a50.tar.gz
opensim-SC_OLD-1cd6b71b60d093b451ba03881ee31efd3eb29a50.tar.bz2
opensim-SC_OLD-1cd6b71b60d093b451ba03881ee31efd3eb29a50.tar.xz
Mantis#1594. Thank you, Melanie for a patch that:
Fixes: - Wearable icon and name sreset to default on copy/paste - Cache is not updated when renaming/moving folders - Partial refactor to make inventory less dependen on AssetBase having a "Name" field - Add llGiveInventoryList() function
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs11
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index d010bd5..3127bd6 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -380,6 +380,13 @@ namespace OpenSim.Framework.Communications.Cache
380 baseFolder.Version = RootFolder.Version; 380 baseFolder.Version = RootFolder.Version;
381 381
382 m_commsManager.InventoryService.UpdateFolder(baseFolder); 382 m_commsManager.InventoryService.UpdateFolder(baseFolder);
383
384 InventoryFolderImpl folder=RootFolder.FindFolder(folderID);
385 if(folder != null)
386 {
387 folder.Name = name;
388 folder.ParentID = parentID;
389 }
383 } 390 }
384 else 391 else
385 { 392 {
@@ -416,6 +423,10 @@ namespace OpenSim.Framework.Communications.Cache
416 423
417 m_commsManager.InventoryService.MoveFolder(baseFolder); 424 m_commsManager.InventoryService.MoveFolder(baseFolder);
418 425
426 InventoryFolderImpl folder=RootFolder.FindFolder(folderID);
427 if(folder != null)
428 folder.ParentID = parentID;
429
419 return true; 430 return true;
420 } 431 }
421 else 432 else