aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs1
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs3
-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
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
67 { 67 {
68 private static readonly byte[] m_defaultTextureEntry; 68 private static readonly byte[] m_defaultTextureEntry;
69 69
70 public byte State;
70 public byte PCode; 71 public byte PCode;
71 public ushort PathBegin; 72 public ushort PathBegin;
72 public ushort PathEnd; 73 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
1389 1389
1390 OutPacket(attach, ThrottleOutPacketType.Task); 1390 OutPacket(attach, ThrottleOutPacketType.Task);
1391 } 1391 }
1392
1392 1393
1393 public void SendPrimitiveToClient( 1394 public void SendPrimitiveToClient(
1394 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, 1395 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos,
@@ -1666,6 +1667,7 @@ namespace OpenSim.Region.ClientStack
1666 { 1667 {
1667 objectData.TextureEntry = primData.TextureEntry; 1668 objectData.TextureEntry = primData.TextureEntry;
1668 objectData.PCode = primData.PCode; 1669 objectData.PCode = primData.PCode;
1670 objectData.State = primData.State;
1669 objectData.PathBegin = primData.PathBegin; 1671 objectData.PathBegin = primData.PathBegin;
1670 objectData.PathEnd = primData.PathEnd; 1672 objectData.PathEnd = primData.PathEnd;
1671 objectData.PathScaleX = primData.PathScaleX; 1673 objectData.PathScaleX = primData.PathScaleX;
@@ -3283,6 +3285,7 @@ namespace OpenSim.Region.ClientStack
3283 PrimitiveBaseShape shape = new PrimitiveBaseShape(); 3285 PrimitiveBaseShape shape = new PrimitiveBaseShape();
3284 3286
3285 shape.PCode = addPacket.ObjectData.PCode; 3287 shape.PCode = addPacket.ObjectData.PCode;
3288 shape.State = addPacket.ObjectData.State;
3286 shape.PathBegin = addPacket.ObjectData.PathBegin; 3289 shape.PathBegin = addPacket.ObjectData.PathBegin;
3287 shape.PathEnd = addPacket.ObjectData.PathEnd; 3290 shape.PathEnd = addPacket.ObjectData.PathEnd;
3288 shape.PathScaleX = addPacket.ObjectData.PathScaleX; 3291 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
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);