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/InventoryArchiveWriteRequest.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/InventoryArchiveWriteRequest.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index ce81deb..0605db5 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
80 | /// <value> | 80 | /// <value> |
81 | /// ID of this request | 81 | /// ID of this request |
82 | /// </value> | 82 | /// </value> |
83 | protected Guid m_id; | 83 | protected UUID m_id; |
84 | 84 | ||
85 | /// <value> | 85 | /// <value> |
86 | /// Used to collect the uuids of the assets that we need to save into the archive | 86 | /// Used to collect the uuids of the assets that we need to save into the archive |
@@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
101 | /// Constructor | 101 | /// Constructor |
102 | /// </summary> | 102 | /// </summary> |
103 | public InventoryArchiveWriteRequest( | 103 | public InventoryArchiveWriteRequest( |
104 | Guid id, InventoryArchiverModule module, Scene scene, | 104 | UUID id, InventoryArchiverModule module, Scene scene, |
105 | UserAccount userInfo, string invPath, string savePath) | 105 | UserAccount userInfo, string invPath, string savePath) |
106 | : this( | 106 | : this( |
107 | id, | 107 | id, |
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
117 | /// Constructor | 117 | /// Constructor |
118 | /// </summary> | 118 | /// </summary> |
119 | public InventoryArchiveWriteRequest( | 119 | public InventoryArchiveWriteRequest( |
120 | Guid id, InventoryArchiverModule module, Scene scene, | 120 | UUID id, InventoryArchiverModule module, Scene scene, |
121 | UserAccount userInfo, string invPath, Stream saveStream) | 121 | UserAccount userInfo, string invPath, Stream saveStream) |
122 | { | 122 | { |
123 | m_id = id; | 123 | m_id = id; |