diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index f2f8cd2..91763a7 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver | |||
56 | 56 | ||
57 | public InventoryArchiveReadRequest(Scene currentScene, CommunicationsManager commsManager) | 57 | public InventoryArchiveReadRequest(Scene currentScene, CommunicationsManager commsManager) |
58 | { | 58 | { |
59 | List<string> serialisedObjects = new List<string>(); | 59 | //List<string> serialisedObjects = new List<string>(); |
60 | scene = currentScene; | 60 | scene = currentScene; |
61 | this.commsManager = commsManager; | 61 | this.commsManager = commsManager; |
62 | } | 62 | } |
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver | |||
150 | 150 | ||
151 | string firstName = cmdparams[0]; | 151 | string firstName = cmdparams[0]; |
152 | string lastName = cmdparams[1]; | 152 | string lastName = cmdparams[1]; |
153 | string invPath = cmdparams[2]; | 153 | //string invPath = cmdparams[2]; |
154 | loadPath = (cmdparams.Length > 3 ? cmdparams[3] : "inventory.tar.gz"); | 154 | loadPath = (cmdparams.Length > 3 ? cmdparams[3] : "inventory.tar.gz"); |
155 | 155 | ||
156 | archive | 156 | archive |
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver | |||
192 | /// <returns>true if asset was successfully loaded, false otherwise</returns> | 192 | /// <returns>true if asset was successfully loaded, false otherwise</returns> |
193 | private bool LoadAsset(string assetPath, byte[] data) | 193 | private bool LoadAsset(string assetPath, byte[] data) |
194 | { | 194 | { |
195 | IRegionSerialiser serialiser = scene.RequestModuleInterface<IRegionSerialiser>(); | 195 | //IRegionSerialiser serialiser = scene.RequestModuleInterface<IRegionSerialiser>(); |
196 | // Right now we're nastily obtaining the UUID from the filename | 196 | // Right now we're nastily obtaining the UUID from the filename |
197 | string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); | 197 | string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); |
198 | int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR); | 198 | int i = filename.LastIndexOf(ArchiveConstants.ASSET_EXTENSION_SEPARATOR); |