diff options
| author | Dan Lake | 2013-02-06 16:45:47 -0800 |
|---|---|---|
| committer | Dan Lake | 2013-02-06 16:45:47 -0800 |
| commit | 7590ebc934477d0c410cae1bbc40664453d57001 (patch) | |
| tree | abcb69bf2b26d23454a37af8609711376b6f1dee /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
| parent | WebStats will now use actual logfile as specified in OpenSim.exe.config rathe... (diff) | |
| parent | minor: add method doc to DAMap.ValidateKey() (diff) | |
| download | opensim-SC-7590ebc934477d0c410cae1bbc40664453d57001.zip opensim-SC-7590ebc934477d0c410cae1bbc40664453d57001.tar.gz opensim-SC-7590ebc934477d0c410cae1bbc40664453d57001.tar.bz2 opensim-SC-7590ebc934477d0c410cae1bbc40664453d57001.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index 823402b..ec25aa9 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
| @@ -75,6 +75,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
| 75 | PhysicsScene = parentScene; | 75 | PhysicsScene = parentScene; |
| 76 | LocalID = localID; | 76 | LocalID = localID; |
| 77 | PhysObjectName = name; | 77 | PhysObjectName = name; |
| 78 | Name = name; // PhysicsActor also has the name of the object. Someday consolidate. | ||
| 78 | TypeName = typeName; | 79 | TypeName = typeName; |
| 79 | 80 | ||
| 80 | // We don't have any physical representation yet. | 81 | // We don't have any physical representation yet. |