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/InventoryArchiverModule.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/InventoryArchiverModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index dc67738..0e4d79c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
66 | /// <value> | 66 | /// <value> |
67 | /// Pending save completions initiated from the console | 67 | /// Pending save completions initiated from the console |
68 | /// </value> | 68 | /// </value> |
69 | protected List<Guid> m_pendingConsoleSaves = new List<Guid>(); | 69 | protected List<UUID> m_pendingConsoleSaves = new List<UUID>(); |
70 | 70 | ||
71 | /// <value> | 71 | /// <value> |
72 | /// All scenes that this module knows about | 72 | /// All scenes that this module knows about |
@@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
175 | /// Trigger the inventory archive saved event. | 175 | /// Trigger the inventory archive saved event. |
176 | /// </summary> | 176 | /// </summary> |
177 | protected internal void TriggerInventoryArchiveSaved( | 177 | protected internal void TriggerInventoryArchiveSaved( |
178 | Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, | 178 | UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, |
179 | Exception reportedException) | 179 | Exception reportedException) |
180 | { | 180 | { |
181 | InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; | 181 | InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; |
@@ -184,13 +184,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
184 | } | 184 | } |
185 | 185 | ||
186 | public bool ArchiveInventory( | 186 | public bool ArchiveInventory( |
187 | Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream) | 187 | UUID id, string firstName, string lastName, string invPath, string pass, Stream saveStream) |
188 | { | 188 | { |
189 | return ArchiveInventory(id, firstName, lastName, invPath, pass, saveStream, new Dictionary<string, object>()); | 189 | return ArchiveInventory(id, firstName, lastName, invPath, pass, saveStream, new Dictionary<string, object>()); |
190 | } | 190 | } |
191 | 191 | ||
192 | public bool ArchiveInventory( | 192 | public bool ArchiveInventory( |
193 | Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream, | 193 | UUID id, string firstName, string lastName, string invPath, string pass, Stream saveStream, |
194 | Dictionary<string, object> options) | 194 | Dictionary<string, object> options) |
195 | { | 195 | { |
196 | if (m_scenes.Count > 0) | 196 | if (m_scenes.Count > 0) |
@@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
230 | } | 230 | } |
231 | 231 | ||
232 | public bool ArchiveInventory( | 232 | public bool ArchiveInventory( |
233 | Guid id, string firstName, string lastName, string invPath, string pass, string savePath, | 233 | UUID id, string firstName, string lastName, string invPath, string pass, string savePath, |
234 | Dictionary<string, object> options) | 234 | Dictionary<string, object> options) |
235 | { | 235 | { |
236 | // if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath)) | 236 | // if (!ConsoleUtil.CheckFileDoesNotExist(MainConsole.Instance, savePath)) |
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
417 | /// <param name="cmdparams"></param> | 417 | /// <param name="cmdparams"></param> |
418 | protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams) | 418 | protected void HandleSaveInvConsoleCommand(string module, string[] cmdparams) |
419 | { | 419 | { |
420 | Guid id = Guid.NewGuid(); | 420 | UUID id = UUID.Random(); |
421 | 421 | ||
422 | Dictionary<string, object> options = new Dictionary<string, object>(); | 422 | Dictionary<string, object> options = new Dictionary<string, object>(); |
423 | 423 | ||
@@ -477,7 +477,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
477 | } | 477 | } |
478 | 478 | ||
479 | private void SaveInvConsoleCommandCompleted( | 479 | private void SaveInvConsoleCommandCompleted( |
480 | Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, | 480 | UUID id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, |
481 | Exception reportedException) | 481 | Exception reportedException) |
482 | { | 482 | { |
483 | lock (m_pendingConsoleSaves) | 483 | lock (m_pendingConsoleSaves) |