clockwerk-opensim-stable – Diff between revs 1 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 1 Rev 3
Line 108... Line 108...
108 MemoryStream archiveWriteStream = new MemoryStream(); 108 MemoryStream archiveWriteStream = new MemoryStream();
109 m_archiverModule.OnInventoryArchiveSaved += SaveCompleted; 109 m_archiverModule.OnInventoryArchiveSaved += SaveCompleted;
Line 110... Line 110...
110   110  
111 mre.Reset(); 111 mre.Reset();
112 m_archiverModule.ArchiveInventory( 112 m_archiverModule.ArchiveInventory(
113 Guid.NewGuid(), userFirstName, userLastName, "/", userPassword, archiveWriteStream); 113 Guid.NewGuid(), userFirstName, userLastName, "/", archiveWriteStream);
Line 114... Line 114...
114 mre.WaitOne(60000, false); 114 mre.WaitOne(60000, false);
115   115  
116 // Test created iar 116 // Test created iar
Line 177... Line 177...
177 MemoryStream archiveWriteStream = new MemoryStream(); 177 MemoryStream archiveWriteStream = new MemoryStream();
178 m_archiverModule.OnInventoryArchiveSaved += SaveCompleted; 178 m_archiverModule.OnInventoryArchiveSaved += SaveCompleted;
Line 179... Line 179...
179   179  
180 mre.Reset(); 180 mre.Reset();
181 m_archiverModule.ArchiveInventory( 181 m_archiverModule.ArchiveInventory(
182 Guid.NewGuid(), userFirstName, userLastName, "f1", userPassword, archiveWriteStream); 182 Guid.NewGuid(), userFirstName, userLastName, "f1", archiveWriteStream);
Line 183... Line 183...
183 mre.WaitOne(60000, false); 183 mre.WaitOne(60000, false);
184   184  
185 // Test created iar 185 // Test created iar
Line 265... Line 265...
265 MemoryStream archiveWriteStream = new MemoryStream(); 265 MemoryStream archiveWriteStream = new MemoryStream();
266 m_archiverModule.OnInventoryArchiveSaved += SaveCompleted; 266 m_archiverModule.OnInventoryArchiveSaved += SaveCompleted;
Line 267... Line 267...
267   267  
268 mre.Reset(); 268 mre.Reset();
269 m_archiverModule.ArchiveInventory( 269 m_archiverModule.ArchiveInventory(
270 Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream); 270 Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, archiveWriteStream);
Line 271... Line 271...
271 mre.WaitOne(60000, false); 271 mre.WaitOne(60000, false);
272   272  
273 byte[] archive = archiveWriteStream.ToArray(); 273 byte[] archive = archiveWriteStream.ToArray();
Line 362... Line 362...
362 Dictionary<string, Object> options = new Dictionary<string, Object>(); 362 Dictionary<string, Object> options = new Dictionary<string, Object>();
363 options.Add("noassets", true); 363 options.Add("noassets", true);
Line 364... Line 364...
364   364  
365 // When we're not saving assets, archiving is being done synchronously. 365 // When we're not saving assets, archiving is being done synchronously.
366 m_archiverModule.ArchiveInventory( 366 m_archiverModule.ArchiveInventory(
Line 367... Line 367...
367 Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream, options); 367 Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, archiveWriteStream, options);
368   368  
369 byte[] archive = archiveWriteStream.ToArray(); 369 byte[] archive = archiveWriteStream.ToArray();