diff options
author | Teravus Ovares (Dan Olivares) | 2009-09-04 20:19:50 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-09-04 20:19:50 -0400 |
commit | 2c09634aed3c270412159cd11f34f3d49c5154ba (patch) | |
tree | bb8b434fe20d325781032e27f1770f92299ad746 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | * Fixes various quirks rezzing in virtual regions. (diff) | |
parent | Add ids to iar requests (diff) | |
download | opensim-SC_OLD-2c09634aed3c270412159cd11f34f3d49c5154ba.zip opensim-SC_OLD-2c09634aed3c270412159cd11f34f3d49c5154ba.tar.gz opensim-SC_OLD-2c09634aed3c270412159cd11f34f3d49c5154ba.tar.bz2 opensim-SC_OLD-2c09634aed3c270412159cd11f34f3d49c5154ba.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index f73a7e3..18728c6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -60,6 +60,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
60 | protected UuidGatherer m_assetGatherer; | 60 | protected UuidGatherer m_assetGatherer; |
61 | 61 | ||
62 | /// <value> | 62 | /// <value> |
63 | /// ID of this request | ||
64 | /// </value> | ||
65 | protected Guid m_id; | ||
66 | |||
67 | /// <value> | ||
63 | /// Used to collect the uuids of the assets that we need to save into the archive | 68 | /// Used to collect the uuids of the assets that we need to save into the archive |
64 | /// </value> | 69 | /// </value> |
65 | protected Dictionary<UUID, int> m_assetUuids = new Dictionary<UUID, int>(); | 70 | protected Dictionary<UUID, int> m_assetUuids = new Dictionary<UUID, int>(); |
@@ -78,8 +83,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
78 | /// Constructor | 83 | /// Constructor |
79 | /// </summary> | 84 | /// </summary> |
80 | public InventoryArchiveWriteRequest( | 85 | public InventoryArchiveWriteRequest( |
81 | InventoryArchiverModule module, CachedUserInfo userInfo, string invPath, string savePath) | 86 | Guid id, InventoryArchiverModule module, CachedUserInfo userInfo, string invPath, string savePath) |
82 | : this( | 87 | : this( |
88 | id, | ||
83 | module, | 89 | module, |
84 | userInfo, | 90 | userInfo, |
85 | invPath, | 91 | invPath, |
@@ -91,8 +97,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
91 | /// Constructor | 97 | /// Constructor |
92 | /// </summary> | 98 | /// </summary> |
93 | public InventoryArchiveWriteRequest( | 99 | public InventoryArchiveWriteRequest( |
94 | InventoryArchiverModule module, CachedUserInfo userInfo, string invPath, Stream saveStream) | 100 | Guid id, InventoryArchiverModule module, CachedUserInfo userInfo, string invPath, Stream saveStream) |
95 | { | 101 | { |
102 | m_id = id; | ||
96 | m_module = module; | 103 | m_module = module; |
97 | m_userInfo = userInfo; | 104 | m_userInfo = userInfo; |
98 | m_invPath = invPath; | 105 | m_invPath = invPath; |
@@ -116,7 +123,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
116 | succeeded = false; | 123 | succeeded = false; |
117 | } | 124 | } |
118 | 125 | ||
119 | m_module.TriggerInventoryArchiveSaved(succeeded, m_userInfo, m_invPath, m_saveStream, reportedException); | 126 | m_module.TriggerInventoryArchiveSaved( |
127 | m_id, succeeded, m_userInfo, m_invPath, m_saveStream, reportedException); | ||
120 | } | 128 | } |
121 | 129 | ||
122 | protected void SaveInvItem(InventoryItemBase inventoryItem, string path) | 130 | protected void SaveInvItem(InventoryItemBase inventoryItem, string path) |
@@ -199,7 +207,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
199 | InventoryFolderImpl inventoryFolder = null; | 207 | InventoryFolderImpl inventoryFolder = null; |
200 | InventoryItemBase inventoryItem = null; | 208 | InventoryItemBase inventoryItem = null; |
201 | 209 | ||
202 | /* | ||
203 | if (!m_userInfo.HasReceivedInventory) | 210 | if (!m_userInfo.HasReceivedInventory) |
204 | { | 211 | { |
205 | // If the region server has access to the user admin service (by which users are created), | 212 | // If the region server has access to the user admin service (by which users are created), |
@@ -221,7 +228,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
221 | m_userInfo.FetchInventory(); | 228 | m_userInfo.FetchInventory(); |
222 | } | 229 | } |
223 | } | 230 | } |
224 | */ | ||
225 | 231 | ||
226 | bool foundStar = false; | 232 | bool foundStar = false; |
227 | 233 | ||
@@ -274,7 +280,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
274 | // We couldn't find the path indicated | 280 | // We couldn't find the path indicated |
275 | m_saveStream.Close(); | 281 | m_saveStream.Close(); |
276 | m_module.TriggerInventoryArchiveSaved( | 282 | m_module.TriggerInventoryArchiveSaved( |
277 | false, m_userInfo, m_invPath, m_saveStream, | 283 | m_id, false, m_userInfo, m_invPath, m_saveStream, |
278 | new Exception(string.Format("Could not find inventory entry at path {0}", m_invPath))); | 284 | new Exception(string.Format("Could not find inventory entry at path {0}", m_invPath))); |
279 | return; | 285 | return; |
280 | } | 286 | } |