diff options
author | Melanie | 2013-12-16 22:11:03 +0000 |
---|---|---|
committer | Melanie | 2013-12-16 22:11:03 +0000 |
commit | fe01e7d1cce9d875b5989931b9652e4cd00c311d (patch) | |
tree | d7e12171d5952d5a96c3f405a5d80c6eebb00937 /OpenSim/Region/Physics | |
parent | This is the acutal sitting avatar crossing code. This commit implements the (diff) | |
parent | Merge branch 'justincc-master' (diff) | |
download | opensim-SC_OLD-fe01e7d1cce9d875b5989931b9652e4cd00c311d.zip opensim-SC_OLD-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.gz opensim-SC_OLD-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.bz2 opensim-SC_OLD-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs index e43136a..0d17e0e 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs | |||
@@ -118,14 +118,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
118 | 118 | ||
119 | public override Vector3 Position { get; set; } | 119 | public override Vector3 Position { get; set; } |
120 | 120 | ||
121 | public override Vector3 Size | 121 | public override Vector3 Size { get; set; } |
122 | { | ||
123 | get { return _size; } | ||
124 | set { | ||
125 | _size = value; | ||
126 | _size.Z = _size.Z / 2.0f; | ||
127 | } | ||
128 | } | ||
129 | 122 | ||
130 | public override PrimitiveBaseShape Shape | 123 | public override PrimitiveBaseShape Shape |
131 | { | 124 | { |