5 files changed, 18 insertions, 3 deletions

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 8081ee7..6cfc5c3 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -67,6 +67,7 @@ namespace OpenSim.Framework
     {
         private static readonly byte[] m_defaultTextureEntry;
 
+        public byte State;
         public byte PCode;
         public ushort PathBegin;
         public ushort PathEnd;
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index a94c5da..107bb6d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1389,6 +1389,7 @@ namespace OpenSim.Region.ClientStack
 
             OutPacket(attach, ThrottleOutPacketType.Task);
         }
+        
 
         public void SendPrimitiveToClient(
             ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos,
@@ -1666,6 +1667,7 @@ namespace OpenSim.Region.ClientStack
         {
             objectData.TextureEntry = primData.TextureEntry;
             objectData.PCode = primData.PCode;
+            objectData.State = primData.State;
             objectData.PathBegin = primData.PathBegin;
             objectData.PathEnd = primData.PathEnd;
             objectData.PathScaleX = primData.PathScaleX;
@@ -3283,6 +3285,7 @@ namespace OpenSim.Region.ClientStack
             PrimitiveBaseShape shape = new PrimitiveBaseShape();
 
             shape.PCode = addPacket.ObjectData.PCode;
+            shape.State = addPacket.ObjectData.State;
             shape.PathBegin = addPacket.ObjectData.PathBegin;
             shape.PathEnd = addPacket.ObjectData.PathEnd;
             shape.PathScaleX = addPacket.ObjectData.PathScaleX;
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 5019de3..e053d6e 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Environment.Modules
         {
             if (m_scene == null)
             {
-                Console.WriteLine("Creating Texture download module");
+                //Console.WriteLine("Creating Texture download module");
                 m_thread = new Thread(new ThreadStart(ProcessTextureSenders));
                 m_thread.IsBackground = true;
                 m_thread.Start();
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);