aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authornlin2009-01-14 04:59:57 +0000
committernlin2009-01-14 04:59:57 +0000
commitbfdf2479fb3a0fe401df743b162db65ef5384083 (patch)
treee77c126229feef583110698873b6efbfc66daba3 /OpenSim/Region
parentEasy on locking m_scenePresences in RequestTeleportLocation. With the extra l... (diff)
downloadopensim-SC_OLD-bfdf2479fb3a0fe401df743b162db65ef5384083.zip
opensim-SC_OLD-bfdf2479fb3a0fe401df743b162db65ef5384083.tar.gz
opensim-SC_OLD-bfdf2479fb3a0fe401df743b162db65ef5384083.tar.bz2
opensim-SC_OLD-bfdf2479fb3a0fe401df743b162db65ef5384083.tar.xz
Improve parsing of joint parameters for NINJA physics (Mantis #2966).
Multiple spaces or leading/trailing spaces when specifying the prims to connect should no longer cause problems.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index b22830c..1fffd7f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1470,7 +1470,7 @@ if (m_shape != null) {
1470 1470
1471 List<string> bodyNames = new List<string>(); 1471 List<string> bodyNames = new List<string>();
1472 string RawParams = Description; 1472 string RawParams = Description;
1473 string[] jointParams = RawParams.Split(' '); 1473 string[] jointParams = RawParams.Split(" ".ToCharArray(), System.StringSplitOptions.RemoveEmptyEntries);
1474 string trackedBodyName = null; 1474 string trackedBodyName = null;
1475 if (jointParams.Length >= 2) 1475 if (jointParams.Length >= 2)
1476 { 1476 {
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index f735f60..e45bcda 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2318,7 +2318,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2318 foreach (PhysicsJoint joint in pendingJoints) 2318 foreach (PhysicsJoint joint in pendingJoints)
2319 { 2319 {
2320 //DoJointErrorMessage(joint, "taint: time to create joint with parms: " + joint.RawParams); 2320 //DoJointErrorMessage(joint, "taint: time to create joint with parms: " + joint.RawParams);
2321 string[] jointParams = joint.RawParams.Split(' '); 2321 string[] jointParams = joint.RawParams.Split(" ".ToCharArray(), System.StringSplitOptions.RemoveEmptyEntries);
2322 List<IntPtr> jointBodies = new List<IntPtr>(); 2322 List<IntPtr> jointBodies = new List<IntPtr>();
2323 bool allJointBodiesAreReady = true; 2323 bool allJointBodiesAreReady = true;
2324 foreach (string jointParam in jointParams) 2324 foreach (string jointParam in jointParams)