aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-06 21:20:41 +0100
committerJustin Clark-Casey (justincc)2009-09-06 21:20:41 +0100
commitd8316810a1699ebe912e96f85a85c1e879540ecf (patch)
treef4f800adaeb7aa6b3bf5baa5cf63abed10a16e6d
parentremove warning (diff)
downloadopensim-SC_OLD-d8316810a1699ebe912e96f85a85c1e879540ecf.zip
opensim-SC_OLD-d8316810a1699ebe912e96f85a85c1e879540ecf.tar.gz
opensim-SC_OLD-d8316810a1699ebe912e96f85a85c1e879540ecf.tar.bz2
opensim-SC_OLD-d8316810a1699ebe912e96f85a85c1e879540ecf.tar.xz
remove now unnecessary parts of save iar test
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs21
1 files changed, 4 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index cf9fcaa..5eca4e4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -93,11 +93,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
93 string userFirstName = "Jock"; 93 string userFirstName = "Jock";
94 string userLastName = "Stirrup"; 94 string userLastName = "Stirrup";
95 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); 95 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
96 CachedUserInfo userInfo;
97 96
98 lock (this) 97 lock (this)
99 { 98 {
100 userInfo = UserProfileTestUtils.CreateUserWithInventory( 99 UserProfileTestUtils.CreateUserWithInventory(
101 cm, userFirstName, userLastName, userId, InventoryReceived); 100 cm, userFirstName, userLastName, userId, InventoryReceived);
102 Monitor.Wait(this, 60000); 101 Monitor.Wait(this, 60000);
103 } 102 }
@@ -136,23 +135,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
136 item1.Name = "My Little Dog"; 135 item1.Name = "My Little Dog";
137 item1.AssetID = asset1.FullID; 136 item1.AssetID = asset1.FullID;
138 item1.ID = item1Id; 137 item1.ID = item1Id;
139 InventoryFolderImpl objsFolder = userInfo.RootFolder.FindFolderByPath("Objects"); 138 InventoryFolderBase objsFolder
140 //InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object); 139 = InventoryArchiveUtils.FindFolderByPath(
141 Console.WriteLine("here2"); 140 scene.InventoryService, scene.InventoryService.GetRootFolder(userId), "Objects");
142 /*
143 IInventoryService inventoryService = scene.InventoryService;
144 InventoryFolderBase rootFolder = inventoryService.GetRootFolder(userId);
145 InventoryCollection rootContents = inventoryService.GetFolderContent(userId, rootFolder.ID);
146 */
147 /*
148 InventoryFolderBase objsFolder = null;
149 foreach (InventoryFolderBase folder in rootContents.Folders)
150 if (folder.Name == "Objects")
151 objsFolder = folder;
152 */
153 item1.Folder = objsFolder.ID; 141 item1.Folder = objsFolder.ID;
154 scene.AddInventoryItem(userId, item1); 142 scene.AddInventoryItem(userId, item1);
155 userInfo.AddItem(item1);
156 143
157 MemoryStream archiveWriteStream = new MemoryStream(); 144 MemoryStream archiveWriteStream = new MemoryStream();
158 archiverModule.OnInventoryArchiveSaved += SaveCompleted; 145 archiverModule.OnInventoryArchiveSaved += SaveCompleted;