From 95809cabd947dcbbc69526fec2ad05a10458ddd3 Mon Sep 17 00:00:00 2001 From: justincc Date: Tue, 18 Sep 2012 23:45:06 +0100 Subject: Update libopenmetaverse components to commit f5cecaa Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5. DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs. libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues. --- bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 24576 -> 24576 bytes bin/OpenMetaverse.StructuredData.dll | Bin 114688 -> 102400 bytes bin/OpenMetaverse.dll | Bin 1904640 -> 1765376 bytes bin/OpenMetaverse.dll.config | 8 +++----- bin/OpenMetaverseTypes.dll | Bin 122880 -> 114688 bytes .../libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so | Bin 124540 -> 0 bytes bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so | Bin 128100 -> 0 bytes bin/lib32/libopenjpeg-dotnet.so | Bin 0 -> 139088 bytes .../libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so | Bin 142616 -> 0 bytes .../libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib | Bin 125136 -> 0 bytes bin/lib64/libopenjpeg-dotnet-x86_64.so | Bin 0 -> 149392 bytes bin/lib64/libopenjpeg-dotnet.dylib | Bin 0 -> 147288 bytes bin/openjpeg-dotnet-x86_64.dll | Bin 843776 -> 215040 bytes bin/openjpeg-dotnet.dll | Bin 187392 -> 201216 bytes bin/pCampBot.exe.config | 0 15 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so delete mode 100644 bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so create mode 100755 bin/lib32/libopenjpeg-dotnet.so delete mode 100644 bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so delete mode 100644 bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib create mode 100755 bin/lib64/libopenjpeg-dotnet-x86_64.so create mode 100755 bin/lib64/libopenjpeg-dotnet.dylib mode change 100644 => 100755 bin/pCampBot.exe.config diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index 1b4cab5..30b9c7b 100755 Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index 7b5174d..5c0b3c6 100755 Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index a08b406..511096e 100755 Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config index e8c90a4..b67da5f 100644 --- a/bin/OpenMetaverse.dll.config +++ b/bin/OpenMetaverse.dll.config @@ -1,7 +1,5 @@ - - - - - + + + diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index fc4f8eb..8bc8885 100755 Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ diff --git a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so deleted file mode 100644 index 0106b56..0000000 Binary files a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so and /dev/null differ diff --git a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so deleted file mode 100644 index 53543e7..0000000 Binary files a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so and /dev/null differ diff --git a/bin/lib32/libopenjpeg-dotnet.so b/bin/lib32/libopenjpeg-dotnet.so new file mode 100755 index 0000000..5914368 Binary files /dev/null and b/bin/lib32/libopenjpeg-dotnet.so differ diff --git a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so deleted file mode 100644 index be11bb4..0000000 Binary files a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so and /dev/null differ diff --git a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib deleted file mode 100644 index dc50775..0000000 Binary files a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib and /dev/null differ diff --git a/bin/lib64/libopenjpeg-dotnet-x86_64.so b/bin/lib64/libopenjpeg-dotnet-x86_64.so new file mode 100755 index 0000000..421dc56 Binary files /dev/null and b/bin/lib64/libopenjpeg-dotnet-x86_64.so differ diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib new file mode 100755 index 0000000..18ca868 Binary files /dev/null and b/bin/lib64/libopenjpeg-dotnet.dylib differ diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll index 97729ff..9e8cd21 100755 Binary files a/bin/openjpeg-dotnet-x86_64.dll and b/bin/openjpeg-dotnet-x86_64.dll differ diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll index 64b2557..6377b8d 100755 Binary files a/bin/openjpeg-dotnet.dll and b/bin/openjpeg-dotnet.dll differ diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config old mode 100644 new mode 100755 -- cgit v1.1