OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few minor changes/additions/fixes.

afrisby
MW 2007-12-11 16:05:53 +00:00
parent ffd60baa48
commit 909fcd554f
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -67,6 +67,7 @@ namespace OpenSim.Framework
{ {
private static readonly byte[] m_defaultTextureEntry; private static readonly byte[] m_defaultTextureEntry;
public byte State;
public byte PCode; public byte PCode;
public ushort PathBegin; public ushort PathBegin;
public ushort PathEnd; public ushort PathEnd;

3
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -1390,6 +1390,7 @@ namespace OpenSim.Region.ClientStack
OutPacket(attach, ThrottleOutPacketType.Task); OutPacket(attach, ThrottleOutPacketType.Task);
} }
public void SendPrimitiveToClient( public void SendPrimitiveToClient(
ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos,
uint flags, uint flags,
@ -1666,6 +1667,7 @@ namespace OpenSim.Region.ClientStack
{ {
objectData.TextureEntry = primData.TextureEntry; objectData.TextureEntry = primData.TextureEntry;
objectData.PCode = primData.PCode; objectData.PCode = primData.PCode;
objectData.State = primData.State;
objectData.PathBegin = primData.PathBegin; objectData.PathBegin = primData.PathBegin;
objectData.PathEnd = primData.PathEnd; objectData.PathEnd = primData.PathEnd;
objectData.PathScaleX = primData.PathScaleX; objectData.PathScaleX = primData.PathScaleX;
@ -3283,6 +3285,7 @@ namespace OpenSim.Region.ClientStack
PrimitiveBaseShape shape = new PrimitiveBaseShape(); PrimitiveBaseShape shape = new PrimitiveBaseShape();
shape.PCode = addPacket.ObjectData.PCode; shape.PCode = addPacket.ObjectData.PCode;
shape.State = addPacket.ObjectData.State;
shape.PathBegin = addPacket.ObjectData.PathBegin; shape.PathBegin = addPacket.ObjectData.PathBegin;
shape.PathEnd = addPacket.ObjectData.PathEnd; shape.PathEnd = addPacket.ObjectData.PathEnd;
shape.PathScaleX = addPacket.ObjectData.PathScaleX; shape.PathScaleX = addPacket.ObjectData.PathScaleX;

2
OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.Region.Environment.Modules
{ {
if (m_scene == null) 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 = new Thread(new ThreadStart(ProcessTextureSenders));
m_thread.IsBackground = true; m_thread.IsBackground = true;
m_thread.Start(); m_thread.Start();

13
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -891,7 +891,7 @@ namespace OpenSim.Region.Environment.Scenes
SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID); SceneObjectPart rootPart = sceneOb.GetChildPart(sceneOb.UUID);
// if grass or tree, make phantom // if grass or tree, make phantom
//rootPart.ApplySanePermissions(); //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.AddFlag(LLObject.ObjectFlags.Phantom);
//rootPart.ObjectFlags += (uint)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) public void RemovePrim(uint localID, LLUUID avatar_deleter)
{ {
m_innerScene.RemovePrim(localID, avatar_deleter); m_innerScene.RemovePrim(localID, avatar_deleter);