Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support

22 files changed, 14 insertions, 14 deletions

diff --git a/bin/BulletDotNET.dll b/bin/BulletDotNET.dll
deleted file mode 100755
index 40c4348..0000000
--- a/bin/BulletDotNET.dll
+++ /dev/null
diff --git a/bin/BulletDotNET.pdb b/bin/BulletDotNET.pdb
deleted file mode 100644
index a5499ec..0000000
--- a/bin/BulletDotNET.pdb
+++ /dev/null
diff --git a/bin/Fadd.Globalization.Yaml.dll b/bin/Fadd.Globalization.Yaml.dll
deleted file mode 100755
index 66a0706..0000000
--- a/bin/Fadd.Globalization.Yaml.dll
+++ /dev/null
diff --git a/bin/Fadd.dll b/bin/Fadd.dll
deleted file mode 100755
index 06183f1..0000000
--- a/bin/Fadd.dll
+++ /dev/null
diff --git a/bin/Modified.XnaDevRu.BulletX.dll b/bin/Modified.XnaDevRu.BulletX.dll
deleted file mode 100755
index a047f99..0000000
--- a/bin/Modified.XnaDevRu.BulletX.dll
+++ /dev/null
diff --git a/bin/Mono.Data.Sqlite.dll.config b/bin/Mono.Data.Sqlite.dll.config
index ccc0cf5..e66d1b7 100644
--- a/bin/Mono.Data.Sqlite.dll.config
+++ b/bin/Mono.Data.Sqlite.dll.config
@@ -1,5 +1,5 @@
 <configuration>
-  <dllmap os="osx" dll="sqlite3" target="./libsqlite3.dylib" />
-  <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" />
-  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" />
+  <dllmap os="osx" dll="sqlite3" target="lib64/libsqlite3.dylib" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
+  <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="lib32/libsqlite3_32.so" />
 </configuration>
diff --git a/bin/Ode.NET.dll.config b/bin/Ode.NET.dll.config
index f8f071e..c72c281 100644
--- a/bin/Ode.NET.dll.config
+++ b/bin/Ode.NET.dll.config
@@ -1,7 +1,7 @@
 <configuration>
-  <dllmap os="osx" dll="ode" target="libode.dylib" />
-  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="libode-x86_64" />
-  <dllmap os="!windows,osx" cpu="x86" dll="ode" target="libode" />
-  <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="libode-ppc64" />
-  <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="libode-s390x" />
-</configuration>
\ No newline at end of file
+  <dllmap os="osx" dll="ode" target="lib64/libode.dylib" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="lib64/libode-x86_64" />
+  <dllmap os="!windows,osx" cpu="x86" dll="ode" target="lib32/libode" />
+  <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="lib64/libode-ppc64" />
+  <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="lib64/libode-s390x" />
+</configuration>
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index 13fdc11..e8c90a4 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,7 +1,7 @@
 <configuration>
-    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
-    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
-    <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" />
-    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
-    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
+    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
+    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
+    <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" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
 </configuration>
diff --git a/bin/libode.so b/bin/lib32/libode.so
index 6bb85fb..6bb85fb 100644
--- a/bin/libode.so
+++ b/bin/lib32/libode.so
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
index 0106b56..0106b56 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
+++ b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
index 53543e7..53543e7 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
+++ b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so
diff --git a/bin/libsqlite3.txt b/bin/lib32/libsqlite3.txt
index 8ef66bd..8ef66bd 100644
--- a/bin/libsqlite3.txt
+++ b/bin/lib32/libsqlite3.txt
diff --git a/bin/libsqlite3_32.so b/bin/lib32/libsqlite3_32.so
index 171ffcd..171ffcd 100755
--- a/bin/libsqlite3_32.so
+++ b/bin/lib32/libsqlite3_32.so
diff --git a/bin/libode-x86_64.so b/bin/lib64/libode-x86_64.so
index 9c3070a..9c3070a 100644
--- a/bin/libode-x86_64.so
+++ b/bin/lib64/libode-x86_64.so
diff --git a/bin/libode.dylib b/bin/lib64/libode.dylib
index 958d202..958d202 100644
--- a/bin/libode.dylib
+++ b/bin/lib64/libode.dylib
diff --git a/bin/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
index be11bb4..be11bb4 100644
--- a/bin/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
diff --git a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
index dc50775..dc50775 100644
--- a/bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
+++ b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
diff --git a/bin/libsqlite3.dylib b/bin/lib64/libsqlite3.dylib
index 94dcca8..94dcca8 100755
--- a/bin/libsqlite3.dylib
+++ b/bin/lib64/libsqlite3.dylib
diff --git a/bin/libsqlite3_64.so b/bin/lib64/libsqlite3_64.so
index 2646a9c..2646a9c 100755
--- a/bin/libsqlite3_64.so
+++ b/bin/lib64/libsqlite3_64.so
diff --git a/bin/libbulletnet.dll b/bin/libbulletnet.dll
deleted file mode 100755
index 8ec7c55..0000000
--- a/bin/libbulletnet.dll
+++ /dev/null
diff --git a/bin/libbulletnet.so b/bin/libbulletnet.so
deleted file mode 100644
index 14779ea..0000000
--- a/bin/libbulletnet.so
+++ /dev/null
diff --git a/bin/xunit.dll b/bin/xunit.dll
deleted file mode 100755
index a512735..0000000
--- a/bin/xunit.dll
+++ /dev/null