aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorjustincc2012-09-18 23:45:06 +0100
committerjustincc2012-09-18 23:45:06 +0100
commit95809cabd947dcbbc69526fec2ad05a10458ddd3 (patch)
tree35ac32c186f1ef1fd35dce90bc5ea3b567f921e4 /bin
parentCleanup from prev. commit (diff)
downloadopensim-SC_OLD-95809cabd947dcbbc69526fec2ad05a10458ddd3.zip
opensim-SC_OLD-95809cabd947dcbbc69526fec2ad05a10458ddd3.tar.gz
opensim-SC_OLD-95809cabd947dcbbc69526fec2ad05a10458ddd3.tar.bz2
opensim-SC_OLD-95809cabd947dcbbc69526fec2ad05a10458ddd3.tar.xz
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.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/OpenMetaverse.Rendering.Meshmerizer.dllbin24576 -> 24576 bytes
-rwxr-xr-xbin/OpenMetaverse.StructuredData.dllbin114688 -> 102400 bytes
-rwxr-xr-xbin/OpenMetaverse.dllbin1904640 -> 1765376 bytes
-rw-r--r--bin/OpenMetaverse.dll.config8
-rwxr-xr-xbin/OpenMetaverseTypes.dllbin122880 -> 114688 bytes
-rw-r--r--bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.sobin124540 -> 0 bytes
-rw-r--r--bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.sobin128100 -> 0 bytes
-rwxr-xr-xbin/lib32/libopenjpeg-dotnet.sobin0 -> 139088 bytes
-rw-r--r--bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.sobin142616 -> 0 bytes
-rw-r--r--bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylibbin125136 -> 0 bytes
-rwxr-xr-xbin/lib64/libopenjpeg-dotnet-x86_64.sobin0 -> 149392 bytes
-rwxr-xr-xbin/lib64/libopenjpeg-dotnet.dylibbin0 -> 147288 bytes
-rwxr-xr-xbin/openjpeg-dotnet-x86_64.dllbin843776 -> 215040 bytes
-rwxr-xr-xbin/openjpeg-dotnet.dllbin187392 -> 201216 bytes
-rwxr-xr-x[-rw-r--r--]bin/pCampBot.exe.config0
15 files changed, 3 insertions, 5 deletions
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 1b4cab5..30b9c7b 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
Binary files differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 7b5174d..5c0b3c6 100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index a08b406..511096e 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files 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 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" /> 2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.5.0-dotnet-1.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" />
4 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> 4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" />
5 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
6 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
7</configuration> 5</configuration>
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index fc4f8eb..8bc8885 100755
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
Binary files 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
--- a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
+++ /dev/null
Binary files 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
--- a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
+++ /dev/null
Binary files differ
diff --git a/bin/lib32/libopenjpeg-dotnet.so b/bin/lib32/libopenjpeg-dotnet.so
new file mode 100755
index 0000000..5914368
--- /dev/null
+++ b/bin/lib32/libopenjpeg-dotnet.so
Binary files 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
--- a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so
+++ /dev/null
Binary files 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
--- a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/bin/lib64/libopenjpeg-dotnet-x86_64.so
Binary files differ
diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib
new file mode 100755
index 0000000..18ca868
--- /dev/null
+++ b/bin/lib64/libopenjpeg-dotnet.dylib
Binary files differ
diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll
index 97729ff..9e8cd21 100755
--- a/bin/openjpeg-dotnet-x86_64.dll
+++ b/bin/openjpeg-dotnet-x86_64.dll
Binary files differ
diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll
index 64b2557..6377b8d 100755
--- a/bin/openjpeg-dotnet.dll
+++ b/bin/openjpeg-dotnet.dll
Binary files differ
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config
index 9cfb7e9..9cfb7e9 100644..100755
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config