diff options
author | Robert Adams | 2013-04-28 21:50:47 -0700 |
---|---|---|
committer | Robert Adams | 2013-04-29 07:38:55 -0700 |
commit | ad1787770ed02f71feaa002ab689467e187803bb (patch) | |
tree | 08026c7b0b160ae9b16c2876894852f8a729bbb4 /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |
parent | BulletSim: first cut at new linksetCompound shape building. (diff) | |
download | opensim-SC-ad1787770ed02f71feaa002ab689467e187803bb.zip opensim-SC-ad1787770ed02f71feaa002ab689467e187803bb.tar.gz opensim-SC-ad1787770ed02f71feaa002ab689467e187803bb.tar.bz2 opensim-SC-ad1787770ed02f71feaa002ab689467e187803bb.tar.xz |
BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_physicsScene' to match coding conventions and reduce confusion.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index df1dd34..6d0d0eb 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
@@ -80,7 +80,7 @@ public abstract class BSLinkset | |||
80 | 80 | ||
81 | public BSPrimLinkable LinksetRoot { get; protected set; } | 81 | public BSPrimLinkable LinksetRoot { get; protected set; } |
82 | 82 | ||
83 | public BSScene PhysicsScene { get; private set; } | 83 | protected BSScene m_physicsScene { get; private set; } |
84 | 84 | ||
85 | static int m_nextLinksetID = 1; | 85 | static int m_nextLinksetID = 1; |
86 | public int LinksetID { get; private set; } | 86 | public int LinksetID { get; private set; } |
@@ -115,7 +115,7 @@ public abstract class BSLinkset | |||
115 | // We create LOTS of linksets. | 115 | // We create LOTS of linksets. |
116 | if (m_nextLinksetID <= 0) | 116 | if (m_nextLinksetID <= 0) |
117 | m_nextLinksetID = 1; | 117 | m_nextLinksetID = 1; |
118 | PhysicsScene = scene; | 118 | m_physicsScene = scene; |
119 | LinksetRoot = parent; | 119 | LinksetRoot = parent; |
120 | m_children = new HashSet<BSPrimLinkable>(); | 120 | m_children = new HashSet<BSPrimLinkable>(); |
121 | LinksetMass = parent.RawMass; | 121 | LinksetMass = parent.RawMass; |
@@ -158,7 +158,7 @@ public abstract class BSLinkset | |||
158 | } | 158 | } |
159 | 159 | ||
160 | // The child is down to a linkset of just itself | 160 | // The child is down to a linkset of just itself |
161 | return BSLinkset.Factory(PhysicsScene, child); | 161 | return BSLinkset.Factory(m_physicsScene, child); |
162 | } | 162 | } |
163 | 163 | ||
164 | // Return 'true' if the passed object is the root object of this linkset | 164 | // Return 'true' if the passed object is the root object of this linkset |
@@ -316,8 +316,8 @@ public abstract class BSLinkset | |||
316 | // Invoke the detailed logger and output something if it's enabled. | 316 | // Invoke the detailed logger and output something if it's enabled. |
317 | protected void DetailLog(string msg, params Object[] args) | 317 | protected void DetailLog(string msg, params Object[] args) |
318 | { | 318 | { |
319 | if (PhysicsScene.PhysicsLogging.Enabled) | 319 | if (m_physicsScene.PhysicsLogging.Enabled) |
320 | PhysicsScene.DetailLog(msg, args); | 320 | m_physicsScene.DetailLog(msg, args); |
321 | } | 321 | } |
322 | 322 | ||
323 | } | 323 | } |