aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-21 18:06:04 +0000
committerJustin Clark-Casey (justincc)2011-11-21 18:06:04 +0000
commitcead87005bbcb7a4f19440a3bb7876252a7b77ac (patch)
tree44e5e705b72de4a57d15999b71ffcd4bc96eb411 /OpenSim/Region/Physics/Manager
parentActually remove PhysicsActor.SOPDescription this time (diff)
downloadopensim-SC_OLD-cead87005bbcb7a4f19440a3bb7876252a7b77ac.zip
opensim-SC_OLD-cead87005bbcb7a4f19440a3bb7876252a7b77ac.tar.gz
opensim-SC_OLD-cead87005bbcb7a4f19440a3bb7876252a7b77ac.tar.bz2
opensim-SC_OLD-cead87005bbcb7a4f19440a3bb7876252a7b77ac.tar.xz
Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaining their own properties
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index c213e6a..c2acf97 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -161,6 +161,15 @@ namespace OpenSim.Region.Physics.Manager
161 public abstract bool Selected { set; } 161 public abstract bool Selected { set; }
162 162
163 /// <summary> 163 /// <summary>
164 /// Name of this actor.
165 /// </summary>
166 /// <remarks>
167 /// XXX: Bizarrely, this cannot be "Terrain" or "Water" right now unless it really is simulating terrain or
168 /// water. This is not a problem due to the formatting of names given by prims and avatars.
169 /// </remarks>
170 public string Name { get; protected set; }
171
172 /// <summary>
164 /// This is being used by ODE joint code. 173 /// This is being used by ODE joint code.
165 /// </summary> 174 /// </summary>
166 public string SOPName; 175 public string SOPName;