aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/PhysicsScene.cs
diff options
context:
space:
mode:
authordiva2009-02-15 05:00:58 +0000
committerdiva2009-02-15 05:00:58 +0000
commit3d5a9e6748ef743c4db04b427d4d76ea65269618 (patch)
tree1877a66c0ca1f4caa455a7f98dd221897e687620 /OpenSim/Region/Physics/Manager/PhysicsScene.cs
parentSet sculpt map alpha to 255 prior to scaling and meshing. Addresses Mantis #3150 (diff)
downloadopensim-SC_OLD-3d5a9e6748ef743c4db04b427d4d76ea65269618.zip
opensim-SC_OLD-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.gz
opensim-SC_OLD-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.bz2
opensim-SC_OLD-3d5a9e6748ef743c4db04b427d4d76ea65269618.tar.xz
This started as way to correct Mantis #3158, which I believe should be fixed now. The flying status was temporarily being ignored, which caused the avie to drop sometimes -- there was a race condition. In the process it also fixes that annoying bug in basic physics where the avie would drop half-way to the ground upon region crossings (SetAppearance was missing). Additionally, a lot of child-agent-related code has been cleaned up; namely child agents are now consistently not added to physical scenes, and they also don't have appearances. All of that happens in MakeRoot, consistently.
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 2cf4d5a..fbf92a9 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Physics.Manager
62 62
63 public abstract void Initialise(IMesher meshmerizer, IConfigSource config); 63 public abstract void Initialise(IMesher meshmerizer, IConfigSource config);
64 64
65 public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size); 65 public abstract PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size, bool isFlying);
66 66
67 public abstract void RemoveAvatar(PhysicsActor actor); 67 public abstract void RemoveAvatar(PhysicsActor actor);
68 68
@@ -162,7 +162,7 @@ namespace OpenSim.Region.Physics.Manager
162 // Does nothing right now 162 // Does nothing right now
163 } 163 }
164 164
165 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size) 165 public override PhysicsActor AddAvatar(string avName, PhysicsVector position, PhysicsVector size, bool isFlying)
166 { 166 {
167 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position); 167 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position);
168 return PhysicsActor.Null; 168 return PhysicsActor.Null;