diff options
author | Justin Clarke Casey | 2009-02-18 19:26:10 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-18 19:26:10 +0000 |
commit | 5e4cad07eb2cac6671ca86ac19d01f6a882c827d (patch) | |
tree | 929e38f3042661b44031c83a4591760d87daeb49 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |
parent | Fix estate ban list persistence in MySQL and reenable tests (diff) | |
download | opensim-SC_OLD-5e4cad07eb2cac6671ca86ac19d01f6a882c827d.zip opensim-SC_OLD-5e4cad07eb2cac6671ca86ac19d01f6a882c827d.tar.gz opensim-SC_OLD-5e4cad07eb2cac6671ca86ac19d01f6a882c827d.tar.bz2 opensim-SC_OLD-5e4cad07eb2cac6671ca86ac19d01f6a882c827d.tar.xz |
* Make save iar behave properly if the nominated inventory path does not exist
* load iar probably still fails for this
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 1997562..f8a5d9f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -73,7 +73,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
73 | if (m_scenes.Count == 0) | 73 | if (m_scenes.Count == 0) |
74 | { | 74 | { |
75 | scene.RegisterModuleInterface<IInventoryArchiverModule>(this); | 75 | scene.RegisterModuleInterface<IInventoryArchiverModule>(this); |
76 | CommsManager = scene.CommsManager; | 76 | CommsManager = scene.CommsManager; |
77 | OnInventoryArchiveSaved += SaveInvConsoleCommandCompleted; | ||
77 | 78 | ||
78 | scene.AddCommand( | 79 | scene.AddCommand( |
79 | this, "load iar", | 80 | this, "load iar", |
@@ -207,11 +208,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
207 | "[INVENTORY ARCHIVER]: Saving archive {0} from inventory path {1} for {2} {3}", | 208 | "[INVENTORY ARCHIVER]: Saving archive {0} from inventory path {1} for {2} {3}", |
208 | savePath, invPath, firstName, lastName); | 209 | savePath, invPath, firstName, lastName); |
209 | 210 | ||
210 | ArchiveInventory(firstName, lastName, invPath, savePath); | 211 | ArchiveInventory(firstName, lastName, invPath, savePath); |
211 | 212 | } | |
212 | m_log.InfoFormat( | 213 | |
213 | "[INVENTORY ARCHIVER]: Saved archive {0} for {1} {2}", | 214 | private void SaveInvConsoleCommandCompleted( |
214 | savePath, firstName, lastName); | 215 | bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, Exception reportedException) |
216 | { | ||
217 | if (succeeded) | ||
218 | { | ||
219 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0}", userInfo.UserProfile.Name); | ||
220 | } | ||
221 | else | ||
222 | { | ||
223 | m_log.ErrorFormat( | ||
224 | "[INVENTORY ARCHIVER]: Archive save for {0} failed - {1}", | ||
225 | userInfo.UserProfile.Name, reportedException.Message); | ||
226 | } | ||
215 | } | 227 | } |
216 | 228 | ||
217 | /// <summary> | 229 | /// <summary> |