From b267c238fb3c9f572761d54450f33b3655c2121a Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Wed, 11 Mar 2015 22:53:32 +0000 Subject: [PATCH] minor: Remove windows build warning about CompressionLevel package ambiguity. Relates to http://opensimulator.org/mantis/view.php?id=7442 Thanks Fly-Man- --- .../Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 1 + OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 42a4c7a47f..f002ad7a40 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs @@ -43,6 +43,7 @@ using OpenSim.Services.Interfaces; using Ionic.Zlib; using GZipStream = Ionic.Zlib.GZipStream; using CompressionMode = Ionic.Zlib.CompressionMode; +using CompressionLevel = Ionic.Zlib.CompressionLevel; using PermissionMask = OpenSim.Framework.PermissionMask; namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs index d67bdcecc1..cb2c7f19d6 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs @@ -44,6 +44,7 @@ using OpenSim.Region.Framework.Scenes; using Ionic.Zlib; using GZipStream = Ionic.Zlib.GZipStream; using CompressionMode = Ionic.Zlib.CompressionMode; +using CompressionLevel = Ionic.Zlib.CompressionLevel; using OpenSim.Framework.Serialization.External; using PermissionMask = OpenSim.Framework.PermissionMask;