diff options
| author | UbitUmarov | 2017-08-18 04:33:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-08-18 04:33:21 +0100 |
| commit | e2ca5853fc329dd4c4f9008ebe73af95fba07477 (patch) | |
| tree | 1df7904fa498bbad49a1481f34c0f7d576f401f9 | |
| parent | temporary change pcampbot bots lastname convention, to test at osgrid (diff) | |
| parent | Replaced libomv dlls with newly compiled ones to solve crashes with pCampBot.... (diff) | |
| download | opensim-SC-e2ca5853fc329dd4c4f9008ebe73af95fba07477.zip opensim-SC-e2ca5853fc329dd4c4f9008ebe73af95fba07477.tar.gz opensim-SC-e2ca5853fc329dd4c4f9008ebe73af95fba07477.tar.bz2 opensim-SC-e2ca5853fc329dd4c4f9008ebe73af95fba07477.tar.xz | |
Merge branch 'master' into httptests
| -rw-r--r-- | OpenSim/Framework/VersionInfo.cs | 2 | ||||
| -rwxr-xr-x | bin/OpenMetaverse.Rendering.Meshmerizer.dll | bin | 24576 -> 28672 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverse.StructuredData.dll | bin | 118784 -> 102400 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverse.dll | bin | 2404352 -> 2195456 bytes | |||
| -rwxr-xr-x | bin/OpenMetaverseTypes.dll | bin | 118784 -> 110592 bytes | |||
| -rwxr-xr-x | bin/lib32/libBulletSim.dylib | bin | 1439996 -> 2144576 bytes | |||
| -rwxr-xr-x | bin/lib64/libBulletSim.dylib | bin | 0 -> 2144576 bytes |
7 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index 1e6efe5..8426eb0 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs | |||
| @@ -32,7 +32,7 @@ namespace OpenSim | |||
| 32 | public const string VersionNumber = "0.9.1.0"; | 32 | public const string VersionNumber = "0.9.1.0"; |
| 33 | public const string AssemblyVersionNumber = "0.9.1.*"; | 33 | public const string AssemblyVersionNumber = "0.9.1.*"; |
| 34 | 34 | ||
| 35 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 35 | public const Flavour VERSION_FLAVOUR = Flavour.Dev; |
| 36 | 36 | ||
| 37 | public enum Flavour | 37 | public enum Flavour |
| 38 | { | 38 | { |
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index eab5fc7..5d792d7 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 999463d..a81400f 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 83d3946..ba8db16 100755 --- a/bin/OpenMetaverse.dll +++ b/bin/OpenMetaverse.dll | |||
| Binary files differ | |||
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index 3bb48cf..1d3590e 100755 --- a/bin/OpenMetaverseTypes.dll +++ b/bin/OpenMetaverseTypes.dll | |||
| Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib index b7a42e3..e729a2b 100755 --- a/bin/lib32/libBulletSim.dylib +++ b/bin/lib32/libBulletSim.dylib | |||
| Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.dylib b/bin/lib64/libBulletSim.dylib new file mode 100755 index 0000000..e729a2b --- /dev/null +++ b/bin/lib64/libBulletSim.dylib | |||
| Binary files differ | |||