Merge branch 'master' into diva-textures

author: Melanie 2009-10-02 08:23:38 +0100
committer: Melanie 2009-10-02 08:23:38 +0100
commit: 31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch)
tree: a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
parent: Restore the missing image handling to the image manager. The missing (diff)
parent: Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download: opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip
opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz
opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2
opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.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-02 08:23:38 +0100
committer	Melanie	2009-10-02 08:23:38 +0100
commit	31d8cec0f8cd47ff445edc7771e5e73825a57927 (patch)
tree	a2d60604317739fa530502c40ffc71bab2a5c494 /OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
parent	Restore the missing image handling to the image manager. The missing (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.zip opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.gz opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.tar.bz2 opensim-SC-31d8cec0f8cd47ff445edc7771e5e73825a57927.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