vehicle parameters do cross (i hope) on regions in same instance ( others need xml)

1 files changed, 6 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 1bac4d8..324fdb8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1782,14 +1782,19 @@ namespace OpenSim.Region.Framework.Scenes
 //                ResetChildPrimPhysicsPositions();
                 if (m_rootPart.PhysActor != null)
                 {
+                    if (m_vehicle != null)
+                        m_vehicle.SetVehicle(m_rootPart.PhysActor);
                     m_rootPart.PhysActor.Building = false;
-
                 }
                         }
                         else
                         {
                 // Apply physics to the root prim
                 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, false);
+                if (m_rootPart.PhysActor != null && m_vehicle != null)
+                {
+                    m_vehicle.SetVehicle(m_rootPart.PhysActor);
+                }
             }
         }