diff options
| author | Melanie | 2012-02-25 16:24:01 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-25 16:24:01 +0000 |
| commit | 6386fdcda774beacbbdf34c1472bbfe0090b00d8 (patch) | |
| tree | 526eb46b696bde5abe134134e9bf0eedaa77b2f9 /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented (diff) | |
| download | opensim-SC-6386fdcda774beacbbdf34c1472bbfe0090b00d8.zip opensim-SC-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.gz opensim-SC-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.bz2 opensim-SC-6386fdcda774beacbbdf34c1472bbfe0090b00d8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/BulletDotNET.dll | bin | 58880 -> 0 bytes | |||
| -rw-r--r-- | bin/BulletDotNET.pdb | bin | 198144 -> 0 bytes | |||
| -rwxr-xr-x | bin/Fadd.Globalization.Yaml.dll | bin | 28672 -> 0 bytes | |||
| -rwxr-xr-x | bin/Fadd.dll | bin | 172032 -> 0 bytes | |||
| -rwxr-xr-x | bin/Modified.XnaDevRu.BulletX.dll | bin | 208896 -> 0 bytes | |||
| -rw-r--r-- | bin/Mono.Data.Sqlite.dll.config | 6 | ||||
| -rw-r--r-- | bin/Ode.NET.dll.config | 12 | ||||
| -rw-r--r-- | bin/OpenMetaverse.dll.config | 10 | ||||
| -rw-r--r-- | bin/lib32/libode.so (renamed from bin/libode.so) | bin | 3051566 -> 3051566 bytes | |||
| -rw-r--r-- | bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so) | bin | 124540 -> 124540 bytes | |||
| -rw-r--r-- | bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so) | bin | 128100 -> 128100 bytes | |||
| -rw-r--r-- | bin/lib32/libsqlite3.txt (renamed from bin/libsqlite3.txt) | 0 | ||||
| -rwxr-xr-x | bin/lib32/libsqlite3_32.so (renamed from bin/libsqlite3_32.so) | bin | 635852 -> 635852 bytes | |||
| -rw-r--r-- | bin/lib64/libode-x86_64.so (renamed from bin/libode-x86_64.so) | bin | 5546089 -> 5546089 bytes | |||
| -rw-r--r-- | bin/lib64/libode.dylib (renamed from bin/libode.dylib) | bin | 2916380 -> 2916380 bytes | |||
| -rw-r--r-- | bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so) | bin | 142616 -> 142616 bytes | |||
| -rw-r--r-- | bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib (renamed from bin/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib) | bin | 125136 -> 125136 bytes | |||
| -rwxr-xr-x | bin/lib64/libsqlite3.dylib (renamed from bin/libsqlite3.dylib) | bin | 2175300 -> 2175300 bytes | |||
| -rwxr-xr-x | bin/lib64/libsqlite3_64.so (renamed from bin/libsqlite3_64.so) | bin | 783200 -> 783200 bytes | |||
| -rwxr-xr-x | bin/libbulletnet.dll | bin | 369664 -> 0 bytes | |||
| -rw-r--r-- | bin/libbulletnet.so | bin | 4286426 -> 0 bytes | |||
| -rwxr-xr-x | bin/xunit.dll | bin | 65536 -> 0 bytes |
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 | |||
| Binary files differ | |||
diff --git a/bin/BulletDotNET.pdb b/bin/BulletDotNET.pdb deleted file mode 100644 index a5499ec..0000000 --- a/bin/BulletDotNET.pdb +++ /dev/null | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
diff --git a/bin/Fadd.dll b/bin/Fadd.dll deleted file mode 100755 index 06183f1..0000000 --- a/bin/Fadd.dll +++ /dev/null | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
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 @@ | |||
| 1 | <configuration> | 1 | <configuration> |
| 2 | <dllmap os="osx" dll="sqlite3" target="./libsqlite3.dylib" /> | 2 | <dllmap os="osx" dll="sqlite3" target="lib64/libsqlite3.dylib" /> |
| 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="./libsqlite3_64.so" /> | 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="lib64/libsqlite3_64.so" /> |
| 4 | <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="./libsqlite3_32.so" /> | 4 | <dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="lib32/libsqlite3_32.so" /> |
| 5 | </configuration> | 5 | </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 @@ | |||
| 1 | <configuration> | 1 | <configuration> |
| 2 | <dllmap os="osx" dll="ode" target="libode.dylib" /> | 2 | <dllmap os="osx" dll="ode" target="lib64/libode.dylib" /> |
| 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="libode-x86_64" /> | 3 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="lib64/libode-x86_64" /> |
| 4 | <dllmap os="!windows,osx" cpu="x86" dll="ode" target="libode" /> | 4 | <dllmap os="!windows,osx" cpu="x86" dll="ode" target="lib32/libode" /> |
| 5 | <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="libode-ppc64" /> | 5 | <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="lib64/libode-ppc64" /> |
| 6 | <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="libode-s390x" /> | 6 | <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="lib64/libode-s390x" /> |
| 7 | </configuration> \ No newline at end of file | 7 | </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 @@ | |||
| 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="lib64/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="lib32/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="lib64/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="lib32/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="lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" /> |
| 7 | </configuration> | 7 | </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 | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
diff --git a/bin/libode.dylib b/bin/lib64/libode.dylib index 958d202..958d202 100644 --- a/bin/libode.dylib +++ b/bin/lib64/libode.dylib | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
diff --git a/bin/libsqlite3.dylib b/bin/lib64/libsqlite3.dylib index 94dcca8..94dcca8 100755 --- a/bin/libsqlite3.dylib +++ b/bin/lib64/libsqlite3.dylib | |||
| Binary files differ | |||
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 | |||
| Binary files differ | |||
diff --git a/bin/libbulletnet.dll b/bin/libbulletnet.dll deleted file mode 100755 index 8ec7c55..0000000 --- a/bin/libbulletnet.dll +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/libbulletnet.so b/bin/libbulletnet.so deleted file mode 100644 index 14779ea..0000000 --- a/bin/libbulletnet.so +++ /dev/null | |||
| Binary files differ | |||
diff --git a/bin/xunit.dll b/bin/xunit.dll deleted file mode 100755 index a512735..0000000 --- a/bin/xunit.dll +++ /dev/null | |||
| Binary files differ | |||