From 4eef6725f4116aa70de729b71d60636a7d0a68f5 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 17 Jan 2012 20:41:20 +0000 Subject: Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE. As discussed on the opensim-dev mailing list, this is to avoid a demonstrated ODE collider segfault when stress-testing a simulator running more than one region using the bundled pCampbot.exe As before, the ODE revision used is r1755 - only the collider has changed. Tests so far reveal little performance change. However, if noticeable issues do arise, please report on mantis and/or the opensim-dev mailing list. The previous libraries are temporarily in bin/Physics-previous-ode-libs These can be copied back to bin if one wants to compare behaviour with the previous libraries. --- bin/Physics-previous-ode-libs/libode-x86_64.so | Bin 0 -> 5546089 bytes bin/Physics-previous-ode-libs/libode.dylib | Bin 0 -> 2916380 bytes bin/Physics-previous-ode-libs/libode.so | Bin 0 -> 3051566 bytes bin/libode-x86_64.so | Bin 5546089 -> 2601363 bytes bin/libode.dylib | Bin 2916380 -> 1780892 bytes bin/libode.so | Bin 3051566 -> 1807022 bytes bin/ode.dll | Bin 496640 -> 368128 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 bin/Physics-previous-ode-libs/libode-x86_64.so create mode 100644 bin/Physics-previous-ode-libs/libode.dylib create mode 100644 bin/Physics-previous-ode-libs/libode.so (limited to 'bin') diff --git a/bin/Physics-previous-ode-libs/libode-x86_64.so b/bin/Physics-previous-ode-libs/libode-x86_64.so new file mode 100644 index 0000000..9c3070a Binary files /dev/null and b/bin/Physics-previous-ode-libs/libode-x86_64.so differ diff --git a/bin/Physics-previous-ode-libs/libode.dylib b/bin/Physics-previous-ode-libs/libode.dylib new file mode 100644 index 0000000..958d202 Binary files /dev/null and b/bin/Physics-previous-ode-libs/libode.dylib differ diff --git a/bin/Physics-previous-ode-libs/libode.so b/bin/Physics-previous-ode-libs/libode.so new file mode 100644 index 0000000..6bb85fb Binary files /dev/null and b/bin/Physics-previous-ode-libs/libode.so differ diff --git a/bin/libode-x86_64.so b/bin/libode-x86_64.so index 9c3070a..6fcf815 100644 Binary files a/bin/libode-x86_64.so and b/bin/libode-x86_64.so differ diff --git a/bin/libode.dylib b/bin/libode.dylib index 958d202..7ad0ef0 100644 Binary files a/bin/libode.dylib and b/bin/libode.dylib differ diff --git a/bin/libode.so b/bin/libode.so index 6bb85fb..f7ab065 100644 Binary files a/bin/libode.so and b/bin/libode.so differ diff --git a/bin/ode.dll b/bin/ode.dll index f310358..886b685 100755 Binary files a/bin/ode.dll and b/bin/ode.dll differ -- cgit v1.1 From 9ed9720861ef3b63b1fca75c843a509ee3239b17 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Tue, 17 Jan 2012 22:07:40 -0500 Subject: Update osGetGrid**** functions The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section. --- bin/config-include/GridCommon.ini.example | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bin') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 815e08c..d70c8e4 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -58,6 +58,12 @@ ; InventoryServerURI = "http://mygridserver.com:8003" +[GridInfo] + ; + ; Change this to your grid info service + ; + GridInfoURI = "http://mygridserver.com:8002" + [GridService] ; ; Change this to your grid-wide grid server -- cgit v1.1 From a0fb1e1788848d290e28d9575f1996f0c205dad3 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 20 Jan 2012 17:51:12 +0000 Subject: Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collider rather than OPCODE." This reverts commit 4eef6725f4116aa70de729b71d60636a7d0a68f5. Reverting for now since this fails with "terminate called after throwing an instance of 'std::bad_alloc'" on Wright Plaza instances. --- bin/Physics-previous-ode-libs/libode-x86_64.so | Bin 5546089 -> 0 bytes bin/Physics-previous-ode-libs/libode.dylib | Bin 2916380 -> 0 bytes bin/Physics-previous-ode-libs/libode.so | Bin 3051566 -> 0 bytes bin/libode-x86_64.so | Bin 2601363 -> 5546089 bytes bin/libode.dylib | Bin 1780892 -> 2916380 bytes bin/libode.so | Bin 1807022 -> 3051566 bytes bin/ode.dll | Bin 368128 -> 496640 bytes 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/Physics-previous-ode-libs/libode-x86_64.so delete mode 100644 bin/Physics-previous-ode-libs/libode.dylib delete mode 100644 bin/Physics-previous-ode-libs/libode.so (limited to 'bin') diff --git a/bin/Physics-previous-ode-libs/libode-x86_64.so b/bin/Physics-previous-ode-libs/libode-x86_64.so deleted file mode 100644 index 9c3070a..0000000 Binary files a/bin/Physics-previous-ode-libs/libode-x86_64.so and /dev/null differ diff --git a/bin/Physics-previous-ode-libs/libode.dylib b/bin/Physics-previous-ode-libs/libode.dylib deleted file mode 100644 index 958d202..0000000 Binary files a/bin/Physics-previous-ode-libs/libode.dylib and /dev/null differ diff --git a/bin/Physics-previous-ode-libs/libode.so b/bin/Physics-previous-ode-libs/libode.so deleted file mode 100644 index 6bb85fb..0000000 Binary files a/bin/Physics-previous-ode-libs/libode.so and /dev/null differ diff --git a/bin/libode-x86_64.so b/bin/libode-x86_64.so index 6fcf815..9c3070a 100644 Binary files a/bin/libode-x86_64.so and b/bin/libode-x86_64.so differ diff --git a/bin/libode.dylib b/bin/libode.dylib index 7ad0ef0..958d202 100644 Binary files a/bin/libode.dylib and b/bin/libode.dylib differ diff --git a/bin/libode.so b/bin/libode.so index f7ab065..6bb85fb 100644 Binary files a/bin/libode.so and b/bin/libode.so differ diff --git a/bin/ode.dll b/bin/ode.dll index 886b685..f310358 100755 Binary files a/bin/ode.dll and b/bin/ode.dll differ -- cgit v1.1