From 909fcd554fd95205b3a46acc7c79d76e0d254eaa Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 11 Dec 2007 16:05:53 +0000
Subject: A few minor changes/additions/fixes.

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs |  2 +-
 OpenSim/Region/Environment/Scenes/Scene.cs      | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index e98dc9e..c0e07cb 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             foreach (EntityBase entity in moveEntities)
             {
-                entity.UpdateMovement();
+                    entity.UpdateMovement();
             }
         }
         #endregion
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index fd743c9..e4526b2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -891,7 +891,7 @@ namespace OpenSim.Region.Environment.Scenes
                 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
                 // if grass or tree, make phantom
                 //rootPart.ApplySanePermissions();
-                if ((rootPart.Shape.PCode == 95) || (rootPart.Shape.PCode == 255))
+                if ((rootPart.Shape.PCode == 95) || (rootPart.Shape.PCode == 255) || (rootPart.Shape.PCode == 111))
                 {
                     rootPart.AddFlag(LLObject.ObjectFlags.Phantom);
                     //rootPart.ObjectFlags += (uint)LLObject.ObjectFlags.Phantom;
@@ -913,6 +913,17 @@ namespace OpenSim.Region.Environment.Scenes
             }
         }
 
+        public void AddTree(LLVector3 scale, LLQuaternion rotation, LLVector3 position,
+           libsecondlife.ObjectManager.Tree treeType, bool newTree)
+        {
+            PrimitiveBaseShape treeShape = new PrimitiveBaseShape();
+            treeShape.PathCurve = 16;
+            treeShape.PCode = newTree ? (byte)libsecondlife.ObjectManager.PCode.NewTree : (byte)libsecondlife.ObjectManager.PCode.Tree;
+            treeShape.Scale = scale;
+            treeShape.State = (byte)treeType;
+            AddNewPrim(LLUUID.Random(), position, rotation, treeShape);
+        }
+
         public void RemovePrim(uint localID, LLUUID avatar_deleter)
         {
             m_innerScene.RemovePrim(localID, avatar_deleter);
-- 
cgit v1.1