aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs13
3 files changed, 14 insertions, 3 deletions
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
60 { 60 {
61 if (m_scene == null) 61 if (m_scene == null)
62 { 62 {
63 Console.WriteLine("Creating Texture download module"); 63 //Console.WriteLine("Creating Texture download module");
64 m_thread = new Thread(new ThreadStart(ProcessTextureSenders)); 64 m_thread = new Thread(new ThreadStart(ProcessTextureSenders));
65 m_thread.IsBackground = true; 65 m_thread.IsBackground = true;
66 m_thread.Start(); 66 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
147 147
148 foreach (EntityBase entity in moveEntities) 148 foreach (EntityBase entity in moveEntities)
149 { 149 {
150 entity.UpdateMovement(); 150 entity.UpdateMovement();
151 } 151 }
152 } 152 }
153 #endregion 153 #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
891 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID); 891 SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
892 // if grass or tree, make phantom 892 // if grass or tree, make phantom
893 //rootPart.ApplySanePermissions(); 893 //rootPart.ApplySanePermissions();
894 if ((rootPart.Shape.PCode == 95) || (rootPart.Shape.PCode == 255)) 894 if ((rootPart.Shape.PCode == 95) || (rootPart.Shape.PCode == 255) || (rootPart.Shape.PCode == 111))
895 { 895 {
896 rootPart.AddFlag(LLObject.ObjectFlags.Phantom); 896 rootPart.AddFlag(LLObject.ObjectFlags.Phantom);
897 //rootPart.ObjectFlags += (uint)LLObject.ObjectFlags.Phantom; 897 //rootPart.ObjectFlags += (uint)LLObject.ObjectFlags.Phantom;
@@ -913,6 +913,17 @@ namespace OpenSim.Region.Environment.Scenes
913 } 913 }
914 } 914 }
915 915
916 public void AddTree(LLVector3 scale, LLQuaternion rotation, LLVector3 position,
917 libsecondlife.ObjectManager.Tree treeType, bool newTree)
918 {
919 PrimitiveBaseShape treeShape = new PrimitiveBaseShape();
920 treeShape.PathCurve = 16;
921 treeShape.PCode = newTree ? (byte)libsecondlife.ObjectManager.PCode.NewTree : (byte)libsecondlife.ObjectManager.PCode.Tree;
922 treeShape.Scale = scale;
923 treeShape.State = (byte)treeType;
924 AddNewPrim(LLUUID.Random(), position, rotation, treeShape);
925 }
926
916 public void RemovePrim(uint localID, LLUUID avatar_deleter) 927 public void RemovePrim(uint localID, LLUUID avatar_deleter)
917 { 928 {
918 m_innerScene.RemovePrim(localID, avatar_deleter); 929 m_innerScene.RemovePrim(localID, avatar_deleter);