diff options
author | UbitUmarov | 2015-08-20 14:18:17 +0100 |
---|---|---|
committer | UbitUmarov | 2015-08-20 14:18:17 +0100 |
commit | e312a0bc902f11f42faecce275d52dc388a1debb (patch) | |
tree | 390841c4fa159da1d26349cf457a6e6cdb02d883 /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
parent | update old git to os core version (diff) | |
download | opensim-SC-e312a0bc902f11f42faecce275d52dc388a1debb.zip opensim-SC-e312a0bc902f11f42faecce275d52dc388a1debb.tar.gz opensim-SC-e312a0bc902f11f42faecce275d52dc388a1debb.tar.bz2 opensim-SC-e312a0bc902f11f42faecce275d52dc388a1debb.tar.xz |
make it compatible with avn, no point making avn compatible with it
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 5953557..1b7d2bf 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -1969,6 +1969,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1969 | 1969 | ||
1970 | #region Add/Remove Entities | 1970 | #region Add/Remove Entities |
1971 | 1971 | ||
1972 | /* core version | ||
1972 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) | 1973 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) |
1973 | { | 1974 | { |
1974 | OdeCharacter newAv | 1975 | OdeCharacter newAv |
@@ -1983,6 +1984,21 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1983 | 1984 | ||
1984 | return newAv; | 1985 | return newAv; |
1985 | } | 1986 | } |
1987 | */ | ||
1988 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) | ||
1989 | { | ||
1990 | OdeCharacter newAv | ||
1991 | = new OdeCharacter( | ||
1992 | avName, this, position, Vector3.Zero, size, avPIDD, avPIDP, | ||
1993 | avCapRadius, avStandupTensor, avDensity, | ||
1994 | avMovementDivisorWalk, avMovementDivisorRun); | ||
1995 | |||
1996 | newAv.Flying = isFlying; | ||
1997 | newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset; | ||
1998 | newAv.m_avatarplanted = avplanted; | ||
1999 | |||
2000 | return newAv; | ||
2001 | } | ||
1986 | 2002 | ||
1987 | public override void RemoveAvatar(PhysicsActor actor) | 2003 | public override void RemoveAvatar(PhysicsActor actor) |
1988 | { | 2004 | { |