Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaining their own properties

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
         public abstract bool Selected { set; }
 
         /// <summary>
+        /// Name of this actor.
+        /// </summary>
+        /// <remarks>
+        /// XXX: Bizarrely, this cannot be "Terrain" or "Water" right now unless it really is simulating terrain or
+        /// water.  This is not a problem due to the formatting of names given by prims and avatars.
+        /// </remarks>
+        public string Name { get; protected set; }
+
+        /// <summary>
         /// This is being used by ODE joint code.
         /// </summary>
         public string SOPName;