aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-08-20 13:45:45 +0100
committerUbitUmarov2015-08-20 13:45:45 +0100
commit43a83da5ce4e26d21efe0fb06ba5e6d7a49e39c1 (patch)
tree496b8d69d6837e81dcaa52dfab182f9de11442bc /OpenSim/Region/Physics/OdePlugin/OdeScene.cs
parent put back entities remove from updates on SendKillObject. (diff)
downloadopensim-SC_OLD-43a83da5ce4e26d21efe0fb06ba5e6d7a49e39c1.zip
opensim-SC_OLD-43a83da5ce4e26d21efe0fb06ba5e6d7a49e39c1.tar.gz
opensim-SC_OLD-43a83da5ce4e26d21efe0fb06ba5e6d7a49e39c1.tar.bz2
opensim-SC_OLD-43a83da5ce4e26d21efe0fb06ba5e6d7a49e39c1.tar.xz
update old git to os core version
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 6d7f079..5953557 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -1969,16 +1969,11 @@ namespace OpenSim.Region.Physics.OdePlugin
1969 1969
1970 #region Add/Remove Entities 1970 #region Add/Remove Entities
1971 1971
1972 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) 1972 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying)
1973 { 1973 {
1974 Vector3 pos;
1975 pos.X = position.X;
1976 pos.Y = position.Y;
1977 pos.Z = position.Z;
1978
1979 OdeCharacter newAv 1974 OdeCharacter newAv
1980 = new OdeCharacter( 1975 = new OdeCharacter(
1981 avName, this, pos, size, avPIDD, avPIDP, 1976 avName, this, position, velocity, size, avPIDD, avPIDP,
1982 avCapRadius, avStandupTensor, avDensity, 1977 avCapRadius, avStandupTensor, avDensity,
1983 avMovementDivisorWalk, avMovementDivisorRun); 1978 avMovementDivisorWalk, avMovementDivisorRun);
1984 1979