diff options
author | AliciaRaven | 2014-09-06 05:19:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-09-23 00:04:50 +0100 |
commit | 08675d44a754156ecdfd09d01ae1209bf73e2533 (patch) | |
tree | b67c465a45e32b4055348b5c20aee0e721fc736b /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs | |
parent | Include same content filters for IAR file exports that already exist for OAR ... (diff) | |
download | opensim-SC_OLD-08675d44a754156ecdfd09d01ae1209bf73e2533.zip opensim-SC_OLD-08675d44a754156ecdfd09d01ae1209bf73e2533.tar.gz opensim-SC_OLD-08675d44a754156ecdfd09d01ae1209bf73e2533.tar.bz2 opensim-SC_OLD-08675d44a754156ecdfd09d01ae1209bf73e2533.tar.xz |
Change existing IAR save to use UUID for its callback reference instead of Guid. This is for uniformity as discussed on IRC.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs index db78da9..cc746d5 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs | |||
@@ -163,13 +163,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
163 | scene.AddInventoryItem(coaItem); | 163 | scene.AddInventoryItem(coaItem); |
164 | 164 | ||
165 | archiverModule.ArchiveInventory( | 165 | archiverModule.ArchiveInventory( |
166 | Guid.NewGuid(), m_uaLL1.FirstName, m_uaLL1.LastName, "/*", "hampshire", archiveWriteStream); | 166 | UUID.Random(), m_uaLL1.FirstName, m_uaLL1.LastName, "/*", "hampshire", archiveWriteStream); |
167 | 167 | ||
168 | m_iarStreamBytes = archiveWriteStream.ToArray(); | 168 | m_iarStreamBytes = archiveWriteStream.ToArray(); |
169 | } | 169 | } |
170 | 170 | ||
171 | protected void SaveCompleted( | 171 | protected void SaveCompleted( |
172 | Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, | 172 | UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, |
173 | Exception reportedException) | 173 | Exception reportedException) |
174 | { | 174 | { |
175 | mre.Set(); | 175 | mre.Set(); |