Merge branch 'master' into vehicles

author: Melanie 2009-10-01 14:08:15 +0100
committer: Melanie 2009-10-01 14:08:15 +0100
commit: 41ff39414bc70ef645e2180693792c83d61a7539 (patch)
tree: dc711428d4c8fed07791263ff4dfea142d54e4e7 /OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
parent: Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ... (diff)
parent: - adding new LandDataSerializer testcase to "test-xml" target as well (diff)
download: opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.zip
opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.gz
opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.bz2
opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index d9f4951..c8ae229 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -228,7 +228,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                        mono [0x81d28b6]
                        mono [0x81ea2c6]
                        /lib/i686/cmov/libpthread.so.0 [0xb7e744c0]
-                        /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]             
+                        /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]
             */
            // Exclude heightfield geom
author	Melanie	2009-10-01 14:08:15 +0100
committer	Melanie	2009-10-01 14:08:15 +0100
commit	41ff39414bc70ef645e2180693792c83d61a7539 (patch)
tree	dc711428d4c8fed07791263ff4dfea142d54e4e7 /OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
parent	Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ... (diff)
parent	- adding new LandDataSerializer testcase to "test-xml" target as well (diff)
download	opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.zip opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.gz opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.bz2 opensim-SC_OLD-41ff39414bc70ef645e2180693792c83d61a7539.tar.xz

diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs index d9f4951..c8ae229 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -228,7 +228,7 @@ namespace OpenSim.Region.Physics.OdePlugin
228	mono [0x81d28b6]	228	mono [0x81d28b6]
229	mono [0x81ea2c6]	229	mono [0x81ea2c6]
230	/lib/i686/cmov/libpthread.so.0 [0xb7e744c0]	230	/lib/i686/cmov/libpthread.so.0 [0xb7e744c0]
231	/lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]	231	/lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]
232	*/	232	*/
233		233
234	// Exclude heightfield geom	234	// Exclude heightfield geom