diff options
author | Robert Adams | 2013-01-06 22:56:16 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-06 22:56:16 -0800 |
commit | 2e5222055ffa1e721221753c26faba342b920712 (patch) | |
tree | 20731bcd3ed9f553f38a7182b6c49a5eefc6baf8 /OpenSim/Region | |
parent | BulletSim: update DLLs and SOs with better debugging output. (diff) | |
download | opensim-SC_OLD-2e5222055ffa1e721221753c26faba342b920712.zip opensim-SC_OLD-2e5222055ffa1e721221753c26faba342b920712.tar.gz opensim-SC_OLD-2e5222055ffa1e721221753c26faba342b920712.tar.bz2 opensim-SC_OLD-2e5222055ffa1e721221753c26faba342b920712.tar.xz |
BulletSim: comments and removing small compile errors introduced in last commit.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 | ||||
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index befb076..794ee17 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
@@ -6,7 +6,7 @@ | |||
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyrightD | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index c215e3a..fe48166 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -58,8 +58,6 @@ public sealed class BSCharacter : BSPhysObject | |||
58 | private bool _flying; | 58 | private bool _flying; |
59 | private bool _setAlwaysRun; | 59 | private bool _setAlwaysRun; |
60 | private bool _throttleUpdates; | 60 | private bool _throttleUpdates; |
61 | private bool _isColliding; | ||
62 | private bool _collidingObj; | ||
63 | private bool _floatOnWater; | 61 | private bool _floatOnWater; |
64 | private OMV.Vector3 _rotationalVelocity; | 62 | private OMV.Vector3 _rotationalVelocity; |
65 | private bool _kinematic; | 63 | private bool _kinematic; |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs index cc725e8..ee18379 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | |||
@@ -95,9 +95,9 @@ public abstract class BSShape | |||
95 | // protected abstract static BSShape GetReference(); | 95 | // protected abstract static BSShape GetReference(); |
96 | 96 | ||
97 | // Returns a string for debugging that uniquily identifies the memory used by this instance | 97 | // Returns a string for debugging that uniquily identifies the memory used by this instance |
98 | public string AddrString | 98 | public virtual string AddrString |
99 | { | 99 | { |
100 | get { return ptr.ToString("X"); } | 100 | get { return "unknown"; } |
101 | } | 101 | } |
102 | 102 | ||
103 | public override string ToString() | 103 | public override string ToString() |
@@ -105,10 +105,6 @@ public abstract class BSShape | |||
105 | StringBuilder buff = new StringBuilder(); | 105 | StringBuilder buff = new StringBuilder(); |
106 | buff.Append("<p="); | 106 | buff.Append("<p="); |
107 | buff.Append(AddrString); | 107 | buff.Append(AddrString); |
108 | buff.Append(",s="); | ||
109 | buff.Append(type.ToString()); | ||
110 | buff.Append(",k="); | ||
111 | buff.Append(key.ToString("X")); | ||
112 | buff.Append(",c="); | 108 | buff.Append(",c="); |
113 | buff.Append(referenceCount.ToString()); | 109 | buff.Append(referenceCount.ToString()); |
114 | buff.Append(">"); | 110 | buff.Append(">"); |