diff options
author | UbitUmarov | 2012-03-04 04:26:05 +0000 |
---|---|---|
committer | UbitUmarov | 2012-03-04 04:26:05 +0000 |
commit | 01fcd400d7651be5f4aae3547a0489a7ccc5d7f7 (patch) | |
tree | 2b775b1118bf0fc25782c153513fc132ad6297ac /OpenSim/Region/Physics/Manager/PhysicsActor.cs | |
parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
download | opensim-SC-01fcd400d7651be5f4aae3547a0489a7ccc5d7f7.zip opensim-SC-01fcd400d7651be5f4aae3547a0489a7ccc5d7f7.tar.gz opensim-SC-01fcd400d7651be5f4aae3547a0489a7ccc5d7f7.tar.bz2 opensim-SC-01fcd400d7651be5f4aae3547a0489a7ccc5d7f7.tar.xz |
update UbitOde
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index f525e9e..25aa4dc 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -158,9 +158,10 @@ namespace OpenSim.Region.Physics.Manager | |||
158 | 158 | ||
159 | public virtual bool Building { get; set; } | 159 | public virtual bool Building { get; set; } |
160 | 160 | ||
161 | public virtual ContactData ContactData | 161 | public virtual void getContactData(ref ContactData cdata) |
162 | { | 162 | { |
163 | get { return new ContactData(0, 0); } | 163 | cdata.mu = 0; |
164 | cdata.bounce = 0; | ||
164 | } | 165 | } |
165 | 166 | ||
166 | public abstract bool Stopped { get; } | 167 | public abstract bool Stopped { get; } |