diff options
| author | Melanie | 2012-12-17 02:01:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-12-17 02:01:47 +0100 |
| commit | 51354bad484befe0a3a4c0b1840523e24c145235 (patch) | |
| tree | d75ba724c0ff04886e8680ce9e49a5e7d498dda4 /OpenSim/Region/Physics/Manager/PhysicsActor.cs | |
| parent | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina... (diff) | |
| parent | *TESTP unscripted sit: missing files (diff) | |
| download | opensim-SC-51354bad484befe0a3a4c0b1840523e24c145235.zip opensim-SC-51354bad484befe0a3a4c0b1840523e24c145235.tar.gz opensim-SC-51354bad484befe0a3a4c0b1840523e24c145235.tar.bz2 opensim-SC-51354bad484befe0a3a4c0b1840523e24c145235.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index e39cee7..9338130 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -411,6 +411,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 411 | // Warning in a parent part it returns itself, not null | 411 | // Warning in a parent part it returns itself, not null |
| 412 | public virtual PhysicsActor ParentActor { get { return this; } } | 412 | public virtual PhysicsActor ParentActor { get { return this; } } |
| 413 | 413 | ||
| 414 | |||
| 414 | } | 415 | } |
| 415 | 416 | ||
| 416 | public class NullPhysicsActor : PhysicsActor | 417 | public class NullPhysicsActor : PhysicsActor |