let mouse steer work on crossings; some cleanup
parent
0628671d69
commit
03dba18bb6
|
@ -2176,7 +2176,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
// Apply physics to the root prim
|
||||
m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, true);
|
||||
|
||||
|
||||
for (int i = 0; i < parts.Length; i++)
|
||||
{
|
||||
SceneObjectPart part = parts[i];
|
||||
|
|
|
@ -2162,13 +2162,6 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
{
|
||||
AddToPhysics(isPhysical, isPhantom, building, isPhysical);
|
||||
UpdatePhysicsSubscribedEvents(); // not sure if appliable here
|
||||
if(!_VolumeDetectActive &&
|
||||
m_vehicleParams != null &&
|
||||
m_vehicleParams.CameraDecoupled &&
|
||||
m_localId == ParentGroup.RootPart.LocalId)
|
||||
AddFlag(PrimFlags.CameraDecoupled);
|
||||
else
|
||||
RemFlag(PrimFlags.CameraDecoupled);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -4673,11 +4666,6 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
|
|||
|
||||
if (ParentGroup != null)
|
||||
{
|
||||
if(UsePhysics && !SetPhantom && m_localId == ParentGroup.RootPart.LocalId &&
|
||||
m_vehicleParams != null && m_vehicleParams.CameraDecoupled)
|
||||
AddFlag(PrimFlags.CameraDecoupled);
|
||||
else
|
||||
RemFlag(PrimFlags.CameraDecoupled);
|
||||
ParentGroup.HasGroupChanged = true;
|
||||
ScheduleFullUpdate();
|
||||
}
|
||||
|
|
|
@ -1239,6 +1239,14 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
ParentPart = part;
|
||||
m_pos = PrevSitOffset;
|
||||
pos = part.GetWorldPosition();
|
||||
PhysicsActor partPhysActor = part.PhysActor;
|
||||
if(partPhysActor != null)
|
||||
{
|
||||
partPhysActor.OnPhysicsRequestingCameraData -=
|
||||
physActor_OnPhysicsRequestingCameraData;
|
||||
partPhysActor.OnPhysicsRequestingCameraData +=
|
||||
physActor_OnPhysicsRequestingCameraData;
|
||||
}
|
||||
}
|
||||
ParentUUID = UUID.Zero;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue