diff options
author | Justin Clark-Casey (justincc) | 2009-08-28 12:52:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-08-28 12:52:40 +0100 |
commit | d649194be310bf267675ac3cd9f9fce302cc3798 (patch) | |
tree | e6d79e3cd887a91f48939576ebf6e2467ddc0120 /OpenSim/Region | |
parent | minor: remove some commented out iar test code (diff) | |
download | opensim-SC-d649194be310bf267675ac3cd9f9fce302cc3798.zip opensim-SC-d649194be310bf267675ac3cd9f9fce302cc3798.tar.gz opensim-SC-d649194be310bf267675ac3cd9f9fce302cc3798.tar.bz2 opensim-SC-d649194be310bf267675ac3cd9f9fce302cc3798.tar.xz |
minor: formatting and comments
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 8f1ba5c..47a325b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -135,7 +135,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
135 | item1.AssetID = asset1.FullID; | 135 | item1.AssetID = asset1.FullID; |
136 | item1.ID = item1Id; | 136 | item1.ID = item1Id; |
137 | //userInfo.RootFolder.FindFolderByPath("Objects").ID; | 137 | //userInfo.RootFolder.FindFolderByPath("Objects").ID; |
138 | InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object); | 138 | //InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object); |
139 | InventoryFolderBase rootFolder = scene.InventoryService.GetRootFolder(userId); | ||
139 | item1.Folder = objsFolder.ID; | 140 | item1.Folder = objsFolder.ID; |
140 | scene.AddInventoryItem(userId, item1); | 141 | scene.AddInventoryItem(userId, item1); |
141 | 142 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 3301536..650fc7e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -535,7 +535,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
535 | } | 535 | } |
536 | 536 | ||
537 | UUID newFolderId = UUID.Random(); | 537 | UUID newFolderId = UUID.Random(); |
538 | InventoryFolderBase newFolder = new InventoryFolderBase(newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version); | 538 | InventoryFolderBase newFolder |
539 | = new InventoryFolderBase( | ||
540 | newFolderId, folder.Name, recipientId, folder.Type, recipientParentFolderId, folder.Version); | ||
539 | InventoryService.AddFolder(newFolder); | 541 | InventoryService.AddFolder(newFolder); |
540 | 542 | ||
541 | // Give all the subfolders | 543 | // Give all the subfolders |