aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenMetaverse.dll
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-27 21:52:50 +0100
committerJustin Clark-Casey (justincc)2010-07-27 21:52:50 +0100
commit1996eb93b99a566a30a8ed447b3740697c18fc4d (patch)
treea394e28480ca00ddb67051e8f7b67da4d6bedcd8 /bin/OpenMetaverse.dll
parentmake MoapModule ignore possible future media texture data that it can't handle (diff)
downloadopensim-SC-1996eb93b99a566a30a8ed447b3740697c18fc4d.zip
opensim-SC-1996eb93b99a566a30a8ed447b3740697c18fc4d.tar.gz
opensim-SC-1996eb93b99a566a30a8ed447b3740697c18fc4d.tar.bz2
opensim-SC-1996eb93b99a566a30a8ed447b3740697c18fc4d.tar.xz
Update OpenMetaverse libraries to r3287 + r3294 (removal of OpenMetaverse.Http.dll dependency) + r3378 (treat MediaPermission as a bitfield)
As far as I can determine, r3287 + r3294 patch was the previous update to the OpenMetaverse libraries This change just adds r3378 to overcome problems storing media textures with certain permission combinations in inventory This is a limited change in order to isolate moap from any other possible libomv update issues An update to the forthcoming libomv 0.8.3 is expected in due course to replace this This commit also deletes OpenMetaverse.Utilities.* as it's unused (on the advice of jhurliman).
Diffstat (limited to '')
-rw-r--r--bin/OpenMetaverse.dllbin1691648 -> 1691648 bytes
-rw-r--r--bin/OpenMetaverse.dll.config14
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 8751bfc..59e39bb 100644
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
Binary files differ
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index 13fdc11..dc36a45 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,7 +1,7 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" /> 2 <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
4 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" /> 4 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
5 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> 5 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
6 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> 6 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
7</configuration> 7</configuration>