From 2e5222055ffa1e721221753c26faba342b920712 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 6 Jan 2013 22:56:16 -0800
Subject: BulletSim: comments and removing small compile errors introduced in
 last commit.

---
 OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs   | 2 --
 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 @@
  * modification, are permitted provided that the following conditions are met:
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyrightD
+ *     * Redistributions in binary form must reproduce the above copyright
  *       notice, this list of conditions and the following disclaimer in the
  *       documentation and/or other materials provided with the distribution.
  *     * 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
     private bool _flying;
     private bool _setAlwaysRun;
     private bool _throttleUpdates;
-    private bool _isColliding;
-    private bool _collidingObj;
     private bool _floatOnWater;
     private OMV.Vector3 _rotationalVelocity;
     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
     // protected abstract static BSShape GetReference();
 
     // Returns a string for debugging that uniquily identifies the memory used by this instance
-    public string AddrString
+    public virtual string AddrString
     {
-        get { return ptr.ToString("X"); }
+        get { return "unknown"; }
     }
 
     public override string ToString()
@@ -105,10 +105,6 @@ public abstract class BSShape
         StringBuilder buff = new StringBuilder();
         buff.Append("<p=");
         buff.Append(AddrString);
-        buff.Append(",s=");
-        buff.Append(type.ToString());
-        buff.Append(",k=");
-        buff.Append(key.ToString("X"));
         buff.Append(",c=");
         buff.Append(referenceCount.ToString());
         buff.Append(">");
-- 
cgit v1.1