View Issue Details [ Jump to Notes ] | [ Issue History ] [ Print ] |
ID | Project | Category | View Status | Date Submitted | Last Update |
0007442 | opensim | [MISC] Compiling / Building | public | 2015-02-18 04:39 | 2015-08-18 09:35 |
|
Reporter | Fly-Man- | |
Assigned To | Fly-Man- | |
Priority | normal | Severity | minor | Reproducibility | always |
Status | closed | Resolution | fixed | |
Platform | Windows | Operating System | Windows | Operating System Version | 7 |
Product Version | master (dev code) | |
Target Version | master (dev code) | Fixed in Version | | |
|
Summary | 0007442: Ionic.Zlib.CompressionLevel |
Description | It seems when compiling Opensim on Windows 7/8 it keeps asking about CompressionLevel being defined in both System and Ionic.Zlib
Attached patch will clarify that it should use the one from Ionic.Zlib |
Tags | No tags attached. |
|
Git Revision or version number | |
Run Mode | Standalone (1 Region) , Standalone (Multiple Regions) , Grid (1 Region per Sim) , Grid (Multiple Regions per Sim) |
Physics Engine | Other |
Script Engine | |
Environment | .NET / Windows32, .NET / Windows64 |
Mono Version | None |
Viewer | |
|
Attached Files | patch.diff [^] (1,394 bytes) 2015-02-18 04:39 [Show Content] [Hide Content]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;
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 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;
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;
|
|