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

a couple of changes in the new Sceneobject classes, just committing so things are kept in sync.

afrisby
MW 2007-08-07 17:22:15 +00:00
parent 2a0a8c43ef
commit 5ac5785cf2
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -181,9 +181,7 @@ namespace OpenSim.Framework.Communications.Caches
item.inventoryNextPermissions = (1 << 15); item.inventoryNextPermissions = (1 << 15);
item.inventoryEveryOnePermissions = (1 << 15); item.inventoryEveryOnePermissions = (1 << 15);
item.inventoryBasePermissions = (1 << 15); item.inventoryBasePermissions = (1 << 15);
this.Items.Add(item.inventoryID, item); this.Items.Add(item.inventoryID, item);
} }
} }

1
OpenSim/Framework/General/Types/RegionInfo.cs
View File

@ -36,6 +36,7 @@ using OpenSim.Framework.Utilities;
using OpenSim.Framework.Configuration; using OpenSim.Framework.Configuration;
namespace OpenSim.Framework.Types namespace OpenSim.Framework.Types
{ {
public class RegionInfo public class RegionInfo

4
OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs
View File

@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes
this.Pos = pos; this.Pos = pos;
LLVector3 rootOffset = new LLVector3(0, 0, 0); LLVector3 rootOffset = new LLVector3(0, 0, 0);
AllNewSceneObjectPart2 newPart = new AllNewSceneObjectPart2(m_regionHandle, this, ownerID, localID, shape, rootOffset); AllNewSceneObjectPart2 newPart = new AllNewSceneObjectPart2(m_regionHandle, this, ownerID, localID, shape, pos, rootOffset);
this.m_parts.Add(newPart.UUID, newPart); this.m_parts.Add(newPart.UUID, newPart);
this.SetPartAsRoot(newPart); this.SetPartAsRoot(newPart);
} }
@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes
proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0"); proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0");
proper.ObjectData[0].TextureID = new byte[0]; proper.ObjectData[0].TextureID = new byte[0];
proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0"); proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0");
proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.Name + "\0"); proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.PartName + "\0");
proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0"); proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0");
proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask; proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask;
proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask; proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask;

30
OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs
View File

@ -26,7 +26,6 @@ namespace OpenSim.Region.Environment.Scenes
public uint GroupMask = FULL_MASK_PERMISSIONS; public uint GroupMask = FULL_MASK_PERMISSIONS;
public uint EveryoneMask = FULL_MASK_PERMISSIONS; public uint EveryoneMask = FULL_MASK_PERMISSIONS;
public uint BaseMask = FULL_MASK_PERMISSIONS; public uint BaseMask = FULL_MASK_PERMISSIONS;
protected byte[] m_particleSystem = new byte[0]; protected byte[] m_particleSystem = new byte[0];
@ -53,11 +52,11 @@ namespace OpenSim.Region.Environment.Scenes
set { m_localID = value; } set { m_localID = value; }
} }
protected string m_name; protected string m_partName;
public virtual string Name public virtual string PartName
{ {
get { return m_name; } get { return m_partName; }
set { m_name = value; } set { m_partName = value; }
} }
protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128; protected LLObject.ObjectFlags m_flags = (LLObject.ObjectFlags)32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456 + 128;
@ -81,6 +80,14 @@ namespace OpenSim.Region.Environment.Scenes
set { m_regionHandle = value; } set { m_regionHandle = value; }
} }
//unkown if this will be kept, added as a way of removing the group position from the group class
protected LLVector3 m_groupPosition;
public LLVector3 GroupPosition
{
get { return m_groupPosition; }
set { m_groupPosition = value; }
}
protected LLVector3 m_offset; protected LLVector3 m_offset;
public LLVector3 OffsetPosition public LLVector3 OffsetPosition
{ {
@ -165,6 +172,14 @@ namespace OpenSim.Region.Environment.Scenes
} }
#endregion #endregion
//might not end up being used
protected bool m_isRoot;
public bool IsRoot
{
set { m_isRoot = value; }
get { return this.m_isRoot; }
}
#region Constructors #region Constructors
/// <summary> /// <summary>
/// ///
@ -183,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="localID"></param> /// <param name="localID"></param>
/// <param name="shape"></param> /// <param name="shape"></param>
/// <param name="position"></param> /// <param name="position"></param>
public AllNewSceneObjectPart2(ulong regionHandle, AllNewSceneObjectGroup2 parent, LLUUID ownerID, uint localID, PrimitiveBaseShape shape, LLVector3 position) public AllNewSceneObjectPart2(ulong regionHandle, AllNewSceneObjectGroup2 parent, LLUUID ownerID, uint localID, PrimitiveBaseShape shape, LLVector3 groupPosition, LLVector3 offsetPosition)
{ {
this.m_regionHandle = regionHandle; this.m_regionHandle = regionHandle;
this.m_parentGroup = parent; this.m_parentGroup = parent;
@ -196,7 +211,8 @@ namespace OpenSim.Region.Environment.Scenes
this.LocalID = (uint)(localID); this.LocalID = (uint)(localID);
this.m_shape = shape; this.m_shape = shape;
this.OffsetPosition = position; this.m_groupPosition = groupPosition;
this.OffsetPosition = offsetPosition;
this.RotationOffset = LLQuaternion.Identity; this.RotationOffset = LLQuaternion.Identity;
this.Velocity = new LLVector3(0, 0, 0); this.Velocity = new LLVector3(0, 0, 0);
this.AngularVelocity = new LLVector3(0, 0, 0); this.AngularVelocity = new LLVector3(0, 0, 0);