OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, so 

revert previus change assuming it didnt. remove a no longer needed else {}
avinationmerge
UbitUmarov 2014-07-22 15:56:20 +01:00
parent ed905418b3
commit fe900b28c6
1 changed files with 88 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -557,8 +557,7 @@ namespace OpenSim.Region.Framework.Scenes
// actually assume this sog was removed from simulation // actually assume this sog was removed from simulation
return; return;
} }
else
{
if (m_rootPart.KeyframeMotion != null) if (m_rootPart.KeyframeMotion != null)
m_rootPart.KeyframeMotion.StartCrossingCheck(); m_rootPart.KeyframeMotion.StartCrossingCheck();
@ -652,11 +651,8 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
avsToCross.Clear(); avsToCross.Clear();
} }
// else else
// we need to do this on all fails
{ {
if (m_rootPart.KeyframeMotion != null) if (m_rootPart.KeyframeMotion != null)
m_rootPart.KeyframeMotion.CrossingFailure(); m_rootPart.KeyframeMotion.CrossingFailure();
@ -673,7 +669,6 @@ namespace OpenSim.Region.Framework.Scenes
// val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f); // val.Z = Util.Clamp<float>(oldp.Z, 0.5f, 4096.0f);
} }
} }
}
if (RootPart.GetStatusSandbox()) if (RootPart.GetStatusSandbox())
{ {