diff options
| author | Justin Clark-Casey (justincc) | 2015-03-11 22:53:32 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2015-03-11 22:53:32 +0000 |
| commit | b267c238fb3c9f572761d54450f33b3655c2121a (patch) | |
| tree | 3638ed206183cd7d3466107a92f9f671d298861e /OpenSim/Region | |
| parent | minor: Remove unnecessary quoting in Regions.ini.example (diff) | |
| download | opensim-SC_OLD-b267c238fb3c9f572761d54450f33b3655c2121a.zip opensim-SC_OLD-b267c238fb3c9f572761d54450f33b3655c2121a.tar.gz opensim-SC_OLD-b267c238fb3c9f572761d54450f33b3655c2121a.tar.bz2 opensim-SC_OLD-b267c238fb3c9f572761d54450f33b3655c2121a.tar.xz | |
minor: Remove windows build warning about CompressionLevel package ambiguity.
Relates to http://opensimulator.org/mantis/view.php?id=7442
Thanks Fly-Man-
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 42a4c7a..f002ad7 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; | |||
| 43 | using Ionic.Zlib; | 43 | using Ionic.Zlib; |
| 44 | using GZipStream = Ionic.Zlib.GZipStream; | 44 | using GZipStream = Ionic.Zlib.GZipStream; |
| 45 | using CompressionMode = Ionic.Zlib.CompressionMode; | 45 | using CompressionMode = Ionic.Zlib.CompressionMode; |
| 46 | using CompressionLevel = Ionic.Zlib.CompressionLevel; | ||
| 46 | using PermissionMask = OpenSim.Framework.PermissionMask; | 47 | using PermissionMask = OpenSim.Framework.PermissionMask; |
| 47 | 48 | ||
| 48 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | 49 | 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 d67bdce..cb2c7f1 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; | |||
| 44 | using Ionic.Zlib; | 44 | using Ionic.Zlib; |
| 45 | using GZipStream = Ionic.Zlib.GZipStream; | 45 | using GZipStream = Ionic.Zlib.GZipStream; |
| 46 | using CompressionMode = Ionic.Zlib.CompressionMode; | 46 | using CompressionMode = Ionic.Zlib.CompressionMode; |
| 47 | using CompressionLevel = Ionic.Zlib.CompressionLevel; | ||
| 47 | using OpenSim.Framework.Serialization.External; | 48 | using OpenSim.Framework.Serialization.External; |
| 48 | using PermissionMask = OpenSim.Framework.PermissionMask; | 49 | using PermissionMask = OpenSim.Framework.PermissionMask; |
| 49 | 50 | ||