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

let mouse steer work on crossings; some cleanup

LSLKeyTest
UbitUmarov 2016-08-28 04:43:44 +01:00
parent 0628671d69
commit 03dba18bb6
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2176,7 +2176,6 @@ namespace OpenSim.Region.Framework.Scenes
// Apply physics to the root prim // Apply physics to the root prim
m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, true); m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, true);
for (int i = 0; i < parts.Length; i++) for (int i = 0; i < parts.Length; i++)
{ {
SceneObjectPart part = parts[i]; SceneObjectPart part = parts[i];

12
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -2162,13 +2162,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
AddToPhysics(isPhysical, isPhantom, building, isPhysical); AddToPhysics(isPhysical, isPhantom, building, isPhysical);
UpdatePhysicsSubscribedEvents(); // not sure if appliable here 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 else
{ {
@ -4673,11 +4666,6 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
if (ParentGroup != null) 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; ParentGroup.HasGroupChanged = true;
ScheduleFullUpdate(); ScheduleFullUpdate();
} }

8
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1239,6 +1239,14 @@ namespace OpenSim.Region.Framework.Scenes
ParentPart = part; ParentPart = part;
m_pos = PrevSitOffset; m_pos = PrevSitOffset;
pos = part.GetWorldPosition(); pos = part.GetWorldPosition();
PhysicsActor partPhysActor = part.PhysActor;
if(partPhysActor != null)
{
partPhysActor.OnPhysicsRequestingCameraData -=
physActor_OnPhysicsRequestingCameraData;
partPhysActor.OnPhysicsRequestingCameraData +=
physActor_OnPhysicsRequestingCameraData;
}
} }
ParentUUID = UUID.Zero; ParentUUID = UUID.Zero;
} }