4 files changed, 23 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index b102e48..d773ee7 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_nextPosition = m_group.AbsolutePosition + motionThisFrame;
                     m_group.AbsolutePosition = m_nextPosition;
 
-                    m_group.RootPart.Velocity = v;
+                    //m_group.RootPart.Velocity = v;
                     update = true;
                 }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6ef83fb..436a544 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2454,6 +2454,14 @@ namespace OpenSim.Region.Framework.Scenes
             else
                 group.StopScriptInstances();
 
+            List<UUID> avatars = group.GetSittingAvatars();
+            foreach (UUID av in avatars)
+            {
+                ScenePresence p = GetScenePresence(av);
+                if (p != null)
+                    p.StandUp();
+            }
+
             SceneObjectPart[] partList = group.Parts;
 
             foreach (SceneObjectPart part in partList)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 155e450..02a8935 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -272,6 +272,11 @@ namespace OpenSim.Region.Framework.Scenes
         {
             AttachmentPoint = 0;
 
+            // Don't zap trees
+            if (RootPart.Shape.PCode == (byte)PCode.Tree ||
+                RootPart.Shape.PCode == (byte)PCode.NewTree)
+                return;
+
             // Even though we don't use child part state parameters for attachments any more, we still need to set
             // these to zero since having them non-zero in rezzed scene objects will crash some clients.  Even if
             // we store them correctly, scene objects that we receive from elsewhere might not.
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
index c0ca48e..b6e0a97 100644
--- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
+++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs
@@ -131,7 +131,15 @@ namespace OpenSim.Region.Framework.Scenes
 
         public double this[int x, int y]
         {
-            get { return map[x, y]; }
+            get
+            {
+                if (x < 0) x = 0;
+                if (y < 0) y = 0;
+                if (x >= (int)Constants.RegionSize) x = (int)Constants.RegionSize - 1;
+                if (y >= (int)Constants.RegionSize) y = (int)Constants.RegionSize - 1;
+
+                return map[x, y];
+            }
             set
             {
                 // Will "fix" terrain hole problems. Although not fantastically.