aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2014-09-17 13:36:39 +0100
committerUbitUmarov2014-09-17 13:36:39 +0100
commit1953a0f4e02f939f11879e826f99dd53bc9efce9 (patch)
tree581eeb847ac4bfa0d33a82fb40e8ed5460375999 /OpenSim/Region/Framework
parent try to send fly state on tps (diff)
downloadopensim-SC-1953a0f4e02f939f11879e826f99dd53bc9efce9.zip
opensim-SC-1953a0f4e02f939f11879e826f99dd53bc9efce9.tar.gz
opensim-SC-1953a0f4e02f939f11879e826f99dd53bc9efce9.tar.bz2
opensim-SC-1953a0f4e02f939f11879e826f99dd53bc9efce9.tar.xz
Dont add to physics in a child update. It is missing several checks like
sit. makeroot should to it
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index dba95c7..9d06c26 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4268,15 +4268,17 @@ namespace OpenSim.Region.Framework.Scenes
4268 GodLevel = cAgent.GodLevel; 4268 GodLevel = cAgent.GodLevel;
4269 SetAlwaysRun = cAgent.AlwaysRun; 4269 SetAlwaysRun = cAgent.AlwaysRun;
4270 4270
4271 bool isFlying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
4272 4271
4273 Appearance = new AvatarAppearance(cAgent.Appearance); 4272 Appearance = new AvatarAppearance(cAgent.Appearance);
4273/*
4274 bool isFlying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
4275
4274 if (PhysicsActor != null) 4276 if (PhysicsActor != null)
4275 { 4277 {
4276 RemoveFromPhysicalScene(); 4278 RemoveFromPhysicalScene();
4277 AddToPhysicalScene(isFlying); 4279 AddToPhysicalScene(isFlying);
4278 } 4280 }
4279 4281*/
4280 try 4282 try
4281 { 4283 {
4282 lock (scriptedcontrols) 4284 lock (scriptedcontrols)