ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Work on Primitive class.

Browse Source
This commit is contained in:
MW
2007-06-12 15:53:19 +00:00
parent 62a0c7ede3
commit 585f9f0d54
5 changed files with 145 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/OpenSim.Region/World/Entities/Primitive.cs
View File

@@ -93,7 +93,7 @@ namespace OpenSim.Region
/// <param name="clientThreads"></param>
/// <param name="regionHandle"></param>
/// <param name="world"></param>
public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world)
public Primitive( ulong regionHandle, World world)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
@@ -101,6 +101,23 @@ namespace OpenSim.Region
inventoryItems = new Dictionary<LLUUID, InventoryItem>();
}
/// <summary>
///
/// </summary>
/// <param name="regionHandle"></param>
/// <param name="world"></param>
/// <param name="addPacket"></param>
/// <param name="ownerID"></param>
/// <param name="localID"></param>
public Primitive(ulong regionHandle, World world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
m_world = world;
inventoryItems = new Dictionary<LLUUID, InventoryItem>();
this.CreateFromPacket(addPacket, ownerID, localID);
}
/// <summary>
///
/// </summary>
@@ -110,7 +127,7 @@ namespace OpenSim.Region
/// <param name="owner"></param>
/// <param name="fullID"></param>
/// <param name="localID"></param>
public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)
public Primitive( ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
@@ -132,7 +149,7 @@ namespace OpenSim.Region
/// <param name="owner"></param>
/// <param name="localID"></param>
/// <param name="position"></param>
public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)
public Primitive( ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)
{
//m_clientThreads = clientThreads;
m_regionHandle = regionHandle;

3
OpenSim/OpenSim.Region/World/Entities/SceneObject.cs
View File

@@ -62,8 +62,7 @@ namespace OpenSim.Region
/// <param name="localID"></param>
public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
{
this.rootPrimitive = new Primitive(null, this.regionHandle, this.m_world);
this.rootPrimitive.CreateFromPacket(addPacket, agentID, localID);
this.rootPrimitive = new Primitive( this.regionHandle, this.m_world, addPacket, agentID, localID);
}
/// <summary>

3
OpenSim/OpenSim.Region/World/World.cs
View File

@@ -482,8 +482,7 @@ namespace OpenSim.Region
try
{
// MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);
prim.CreateFromPacket(addPacket, ownerID, this._primCount);
Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
this.Entities.Add(prim.uuid, prim);
this._primCount++;