From 479bcd38ab69c4caa6ff6b2bde54522ea6110e23 Mon Sep 17 00:00:00 2001
From: John Hurliman <jhurliman@jhurliman.org>
Date: Tue, 17 Jul 2007 00:06:34 +0000
Subject: [PATCH] Moved openjpegnet assembly in to libsecondlife.dll, should
 make life slightly easier for distributing libsl software. Define NO_UNSAFE
 at compile time to disable OpenJPEGNet components

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1316 52acb1d6-8a22-11de-b505-999d5b087335
---
 SLImageUpload/SLImageUpload.csproj            |   4 -
 bin/libsecondlife.dll.config                  |   5 +
 importprimscript/importprimscript.csproj      |   4 -
 {openjpegnet => libsecondlife}/OpenJPEG.cs    |   5 +
 {openjpegnet => libsecondlife}/TGALoader.cs   |   5 +
 libsecondlife/examples/Baker/Baker.csproj     |   6 +-
 .../examples/TestClient/TestClient.csproj     | 208 +++++++++---------
 .../examples/groupmanager/groupmanager.csproj |   4 -
 .../libsecondlife.Utilities.csproj            |   4 -
 libsecondlife/libsecondlife.csproj            |  12 +-
 libsecondlife/libsecondlife.sln               |   6 -
 11 files changed, 122 insertions(+), 141 deletions(-)
 create mode 100644 bin/libsecondlife.dll.config
 rename {openjpegnet => libsecondlife}/OpenJPEG.cs (99%)
 rename {openjpegnet => libsecondlife}/TGALoader.cs (99%)

diff --git a/SLImageUpload/SLImageUpload.csproj b/SLImageUpload/SLImageUpload.csproj
index fc1b29d3..91a0ac60 100644
--- a/SLImageUpload/SLImageUpload.csproj
+++ b/SLImageUpload/SLImageUpload.csproj
@@ -72,10 +72,6 @@
       <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
       <Name>libsecondlife</Name>
     </ProjectReference>
-    <ProjectReference Include="..\openjpegnet\openjpegnet.csproj">
-      <Project>{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}</Project>
-      <Name>openjpegnet</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/bin/libsecondlife.dll.config b/bin/libsecondlife.dll.config
new file mode 100644
index 00000000..cc35d6e7
--- /dev/null
+++ b/bin/libsecondlife.dll.config
@@ -0,0 +1,5 @@
+<configuration>
+    <dllmap os="osx" dll="openjpeg-libsl.dll" target="libopenjpeg-libsl-2.1.2.0.dylib" />
+    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-libsl.dll" target="libopenjpeg-libsl-2.1.2.0-x86_64.so" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-libsl.dll" target="libopenjpeg-libsl-2.1.2.0.so" />
+</configuration>
diff --git a/importprimscript/importprimscript.csproj b/importprimscript/importprimscript.csproj
index e6693827..9acfd1bb 100644
--- a/importprimscript/importprimscript.csproj
+++ b/importprimscript/importprimscript.csproj
@@ -41,10 +41,6 @@
       <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
       <Name>libsecondlife</Name>
     </ProjectReference>
-    <ProjectReference Include="..\openjpegnet\openjpegnet.csproj">
-      <Project>{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}</Project>
-      <Name>openjpegnet</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
diff --git a/openjpegnet/OpenJPEG.cs b/libsecondlife/OpenJPEG.cs
similarity index 99%
rename from openjpegnet/OpenJPEG.cs
rename to libsecondlife/OpenJPEG.cs
index ac1dbe2f..c6291267 100644
--- a/openjpegnet/OpenJPEG.cs
+++ b/libsecondlife/OpenJPEG.cs
@@ -6,6 +6,9 @@ using System.Runtime.InteropServices;
 
 namespace OpenJPEGNet
 {
+#if NO_UNSAFE
+#else
+
     public class OpenJPEG
     {
         // This structure is used to pass images back and forth for both encoding and decoding
@@ -369,4 +372,6 @@ namespace OpenJPEGNet
             return dest;
         }
     }
+
+#endif
 }
diff --git a/openjpegnet/TGALoader.cs b/libsecondlife/TGALoader.cs
similarity index 99%
rename from openjpegnet/TGALoader.cs
rename to libsecondlife/TGALoader.cs
index d0e3e853..228ef0a0 100644
--- a/openjpegnet/TGALoader.cs
+++ b/libsecondlife/TGALoader.cs
@@ -2,6 +2,9 @@ using System;
 
 namespace OpenJPEGNet
 {
+#if NO_UNSAFE
+#else
+
     /// <summary>
     /// Capability to load TGAs to Bitmap 
     /// </summary>
@@ -557,4 +560,6 @@ namespace OpenJPEGNet
             }
         }
     }
+
+#endif
 }
diff --git a/libsecondlife/examples/Baker/Baker.csproj b/libsecondlife/examples/Baker/Baker.csproj
index dd5d9c5d..2d1af6b5 100644
--- a/libsecondlife/examples/Baker/Baker.csproj
+++ b/libsecondlife/examples/Baker/Baker.csproj
@@ -59,13 +59,9 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\openjpegnet\openjpegnet.csproj">
-      <Project>{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}</Project>
-      <Name>openjpegnet</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\libsecondlife.csproj">
       <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
       <Name>libsecondlife</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/libsecondlife/examples/TestClient/TestClient.csproj b/libsecondlife/examples/TestClient/TestClient.csproj
index 27cccbdc..a0550f3a 100644
--- a/libsecondlife/examples/TestClient/TestClient.csproj
+++ b/libsecondlife/examples/TestClient/TestClient.csproj
@@ -1,112 +1,108 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{B87682F6-B2D7-4C4D-A529-400C24FD4880}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>libsecondlife.TestClient</RootNamespace>
-    <AssemblyName>TestClient</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Arguments.cs" />
-    <Compile Include="Command.cs" />
-    <Compile Include="ClientManager.cs" />
-    <Compile Include="Commands\Communication\EchoMasterCommand.cs" />
-    <Compile Include="Commands\Communication\IMCommand.cs" />
-    <Compile Include="Commands\Communication\SayCommand.cs" />
-    <Compile Include="Commands\Communication\ShoutCommand.cs" />
-    <Compile Include="Commands\Communication\WhisperCommand.cs" />
-    <Compile Include="Commands\GoHome.cs" />
-    <Compile Include="Commands\GotoLandmark.cs" />
-    <Compile Include="Commands\Inventory\AppearanceCommand.cs" />
-    <Compile Include="Commands\Inventory\BalanceCommand.cs" />
-    <Compile Include="Commands\Inventory\DeleteFolderCommand.cs" />
-    <Compile Include="Commands\Inventory\DumpOutfitCommand.cs" />
-    <Compile Include="Commands\Inventory\ExportOutfitCommand.cs" />
-    <Compile Include="Commands\Inventory\GiveAllCommand.cs" />
-    <Compile Include="Commands\Inventory\ImportOutfitCommand.cs" />
-    <Compile Include="Commands\Inventory\InventoryCommand.cs" />
-    <Compile Include="Commands\Inventory\WearCommand.cs" />
-    <Compile Include="Commands\Land\FindSimCommand.cs" />
-    <Compile Include="Commands\Land\ParcelInfoCommand.cs" />
-    <Compile Include="Commands\Movement\FollowCommand.cs" />
-    <Compile Include="Commands\Movement\GotoCommand.cs" />
-    <Compile Include="Commands\Movement\JumpCommand.cs" />
-    <Compile Include="Commands\Movement\LocationCommand.cs" />
-    <Compile Include="Commands\Movement\MoveToCommand.cs" />
-    <Compile Include="Commands\Movement\SetHome.cs" />
-    <Compile Include="Commands\Movement\SitCommand.cs" />
-    <Compile Include="Commands\Movement\SitOnCommand.cs" />
-    <Compile Include="Commands\Movement\StandCommand.cs" />
-    <Compile Include="Commands\Prims\ExportCommand.cs" />
-    <Compile Include="Commands\Prims\ExportParticlesCommand.cs" />
-    <Compile Include="Commands\Prims\ImportCommand.cs" />
-    <Compile Include="Commands\Prims\PrimCountCommand.cs" />
-    <Compile Include="Commands\Stats\DilationCommand.cs" />
-    <Compile Include="Commands\Stats\RegionInfoCommand.cs" />
-    <Compile Include="Commands\Stats\StatsCommand.cs" />
-    <Compile Include="Commands\Stats\UptimeCommand.cs" />
-    <Compile Include="Commands\System\DebugCommand.cs" />
-    <Compile Include="Commands\System\HelpCommand.cs" />
-    <Compile Include="Commands\System\LoadCommand.cs" />
-    <Compile Include="Commands\System\LoginCommand.cs" />
-    <Compile Include="Commands\System\LogoutCommand.cs" />
-    <Compile Include="Commands\System\MD5Command.cs" />
-    <Compile Include="Commands\System\PacketLogCommand.cs" />
-    <Compile Include="Commands\System\QuitCommand.cs" />
-    <Compile Include="Commands\System\SetMasterCommand.cs" />
-    <Compile Include="Commands\System\SetMasterKeyCommand.cs" />
-    <Compile Include="Commands\System\ShowEffectsCommand.cs" />
-    <Compile Include="Parsing.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="TestClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\openjpegnet\openjpegnet.csproj">
-      <Project>{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}</Project>
-      <Name>openjpegnet</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\libsecondlife.csproj">
-      <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
-      <Name>libsecondlife</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\libsecondlife.Utilities\libsecondlife.Utilities.csproj">
-      <Project>{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}</Project>
-      <Name>libsecondlife.Utilities</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B87682F6-B2D7-4C4D-A529-400C24FD4880}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>libsecondlife.TestClient</RootNamespace>
+    <AssemblyName>TestClient</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Arguments.cs" />
+    <Compile Include="Command.cs" />
+    <Compile Include="ClientManager.cs" />
+    <Compile Include="Commands\Communication\EchoMasterCommand.cs" />
+    <Compile Include="Commands\Communication\IMCommand.cs" />
+    <Compile Include="Commands\Communication\SayCommand.cs" />
+    <Compile Include="Commands\Communication\ShoutCommand.cs" />
+    <Compile Include="Commands\Communication\WhisperCommand.cs" />
+    <Compile Include="Commands\GoHome.cs" />
+    <Compile Include="Commands\GotoLandmark.cs" />
+    <Compile Include="Commands\Inventory\AppearanceCommand.cs" />
+    <Compile Include="Commands\Inventory\BalanceCommand.cs" />
+    <Compile Include="Commands\Inventory\DeleteFolderCommand.cs" />
+    <Compile Include="Commands\Inventory\DumpOutfitCommand.cs" />
+    <Compile Include="Commands\Inventory\ExportOutfitCommand.cs" />
+    <Compile Include="Commands\Inventory\GiveAllCommand.cs" />
+    <Compile Include="Commands\Inventory\ImportOutfitCommand.cs" />
+    <Compile Include="Commands\Inventory\InventoryCommand.cs" />
+    <Compile Include="Commands\Inventory\WearCommand.cs" />
+    <Compile Include="Commands\Land\FindSimCommand.cs" />
+    <Compile Include="Commands\Land\ParcelInfoCommand.cs" />
+    <Compile Include="Commands\Movement\FollowCommand.cs" />
+    <Compile Include="Commands\Movement\GotoCommand.cs" />
+    <Compile Include="Commands\Movement\JumpCommand.cs" />
+    <Compile Include="Commands\Movement\LocationCommand.cs" />
+    <Compile Include="Commands\Movement\MoveToCommand.cs" />
+    <Compile Include="Commands\Movement\SetHome.cs" />
+    <Compile Include="Commands\Movement\SitCommand.cs" />
+    <Compile Include="Commands\Movement\SitOnCommand.cs" />
+    <Compile Include="Commands\Movement\StandCommand.cs" />
+    <Compile Include="Commands\Prims\ExportCommand.cs" />
+    <Compile Include="Commands\Prims\ExportParticlesCommand.cs" />
+    <Compile Include="Commands\Prims\ImportCommand.cs" />
+    <Compile Include="Commands\Prims\PrimCountCommand.cs" />
+    <Compile Include="Commands\Stats\DilationCommand.cs" />
+    <Compile Include="Commands\Stats\RegionInfoCommand.cs" />
+    <Compile Include="Commands\Stats\StatsCommand.cs" />
+    <Compile Include="Commands\Stats\UptimeCommand.cs" />
+    <Compile Include="Commands\System\DebugCommand.cs" />
+    <Compile Include="Commands\System\HelpCommand.cs" />
+    <Compile Include="Commands\System\LoadCommand.cs" />
+    <Compile Include="Commands\System\LoginCommand.cs" />
+    <Compile Include="Commands\System\LogoutCommand.cs" />
+    <Compile Include="Commands\System\MD5Command.cs" />
+    <Compile Include="Commands\System\PacketLogCommand.cs" />
+    <Compile Include="Commands\System\QuitCommand.cs" />
+    <Compile Include="Commands\System\SetMasterCommand.cs" />
+    <Compile Include="Commands\System\SetMasterKeyCommand.cs" />
+    <Compile Include="Commands\System\ShowEffectsCommand.cs" />
+    <Compile Include="Parsing.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="TestClient.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\libsecondlife.csproj">
+      <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
+      <Name>libsecondlife</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\libsecondlife.Utilities\libsecondlife.Utilities.csproj">
+      <Project>{CE5E06C2-2428-416B-ADC1-F1FE16A0FB27}</Project>
+      <Name>libsecondlife.Utilities</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
-</Project>
+  -->
+</Project>
\ No newline at end of file
diff --git a/libsecondlife/examples/groupmanager/groupmanager.csproj b/libsecondlife/examples/groupmanager/groupmanager.csproj
index 380c5c4b..f7e411cd 100644
--- a/libsecondlife/examples/groupmanager/groupmanager.csproj
+++ b/libsecondlife/examples/groupmanager/groupmanager.csproj
@@ -88,10 +88,6 @@
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
-    <ProjectReference Include="..\..\..\openjpegnet\openjpegnet.csproj">
-      <Project>{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}</Project>
-      <Name>openjpegnet</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\libsecondlife.csproj">
       <Name>libsecondlife</Name>
       <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
diff --git a/libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj b/libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj
index 964c9aa5..f7827631 100644
--- a/libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj
+++ b/libsecondlife/libsecondlife.Utilities/libsecondlife.Utilities.csproj
@@ -38,10 +38,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\openjpegnet\openjpegnet.csproj">
-      <Project>{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}</Project>
-      <Name>openjpegnet</Name>
-    </ProjectReference>
     <ProjectReference Include="..\libsecondlife.csproj">
       <Project>{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}</Project>
       <Name>libsecondlife</Name>
diff --git a/libsecondlife/libsecondlife.csproj b/libsecondlife/libsecondlife.csproj
index 962dbc0f..88d3a269 100644
--- a/libsecondlife/libsecondlife.csproj
+++ b/libsecondlife/libsecondlife.csproj
@@ -29,7 +29,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
@@ -52,7 +52,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <OutputPath>..\bin\</OutputPath>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
@@ -126,6 +126,7 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ObjectPoolBase.cs" />
+    <Compile Include="OpenJPEG.cs" />
     <Compile Include="ParcelManager.cs" />
     <Compile Include="ParticleSystem.cs">
       <SubType>Code</SubType>
@@ -150,6 +151,7 @@
     <Compile Include="Textures.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="TGALoader.cs" />
     <Compile Include="ThreadUtil.cs" />
     <Compile Include="InventoryNode.cs" />
     <Compile Include="InventoryNodeDictionary.cs" />
@@ -160,12 +162,6 @@
     <Compile Include="_Packets_.cs" />
     <Compile Include="_VisualParam_.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\openjpegnet\openjpegnet.csproj">
-      <Project>{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}</Project>
-      <Name>openjpegnet</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\blush_alpha.tga" />
     <None Include="Resources\bodyfreckles_alpha.tga" />
diff --git a/libsecondlife/libsecondlife.sln b/libsecondlife/libsecondlife.sln
index ae14720a..716032a1 100644
--- a/libsecondlife/libsecondlife.sln
+++ b/libsecondlife/libsecondlife.sln
@@ -22,8 +22,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libsecondlife.Tests", "libs
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualParamGenerator", "VisualParamGenerator\VisualParamGenerator.csproj", "{D2A514C5-5590-4789-9032-6E5B4C297B80}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openjpegnet", "..\openjpegnet\openjpegnet.csproj", "{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Heightmap", "examples\Heightmap\Heightmap.csproj", "{D9669D08-AC81-4F45-AD23-82787C6EFBBA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "key2name", "examples\Key2Name\key2name.csproj", "{4FF68142-9C61-42D1-87DC-5D37CB671C29}"
@@ -93,10 +91,6 @@ Global
 		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D2A514C5-5590-4789-9032-6E5B4C297B80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0DCFDCB-71FA-4343-A8D1-24D4665A94A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9669D08-AC81-4F45-AD23-82787C6EFBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU