From 5ac5785cf2af152b44d8faeb3207b671b81c6684 Mon Sep 17 00:00:00 2001 From: MW Date: Tue, 7 Aug 2007 17:22:15 +0000 Subject: a couple of changes in the new Sceneobject classes, just committing so things are kept in sync. --- .../Communications/Cache/LibraryRootFolder.cs | 4 +-- OpenSim/Framework/General/Types/RegionInfo.cs | 1 + .../Environment/Scenes/AllNewSceneObjectGroup2.cs | 4 +-- .../Environment/Scenes/AllNewSceneObjectPart2.cs | 30 +++++++++++++++++----- 4 files changed, 27 insertions(+), 12 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 7813adc..9e54701 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -181,9 +181,7 @@ namespace OpenSim.Framework.Communications.Caches item.inventoryNextPermissions = (1 << 15); item.inventoryEveryOnePermissions = (1 << 15); item.inventoryBasePermissions = (1 << 15); - this.Items.Add(item.inventoryID, item); - - + this.Items.Add(item.inventoryID, item); } } diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index 297e324..b9ed8d2 100644 --- a/OpenSim/Framework/General/Types/RegionInfo.cs +++ b/OpenSim/Framework/General/Types/RegionInfo.cs @@ -36,6 +36,7 @@ using OpenSim.Framework.Utilities; using OpenSim.Framework.Configuration; + namespace OpenSim.Framework.Types { public class RegionInfo diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs index 84e8120..5d94f22 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs @@ -64,7 +64,7 @@ namespace OpenSim.Region.Environment.Scenes this.Pos = pos; 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.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].TextureID = new byte[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].OwnerMask = this.m_rootPart.OwnerMask; proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask; diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs index 542e13f..7a31369 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs @@ -26,7 +26,6 @@ namespace OpenSim.Region.Environment.Scenes public uint GroupMask = FULL_MASK_PERMISSIONS; public uint EveryoneMask = FULL_MASK_PERMISSIONS; public uint BaseMask = FULL_MASK_PERMISSIONS; - protected byte[] m_particleSystem = new byte[0]; @@ -53,11 +52,11 @@ namespace OpenSim.Region.Environment.Scenes set { m_localID = value; } } - protected string m_name; - public virtual string Name + protected string m_partName; + public virtual string PartName { - get { return m_name; } - set { m_name = value; } + get { return m_partName; } + set { m_partName = value; } } 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; } } + //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; public LLVector3 OffsetPosition { @@ -165,6 +172,14 @@ namespace OpenSim.Region.Environment.Scenes } #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 /// /// @@ -183,7 +198,7 @@ namespace OpenSim.Region.Environment.Scenes /// /// /// - 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_parentGroup = parent; @@ -196,7 +211,8 @@ namespace OpenSim.Region.Environment.Scenes this.LocalID = (uint)(localID); this.m_shape = shape; - this.OffsetPosition = position; + this.m_groupPosition = groupPosition; + this.OffsetPosition = offsetPosition; this.RotationOffset = LLQuaternion.Identity; this.Velocity = new LLVector3(0, 0, 0); this.AngularVelocity = new LLVector3(0, 0, 0); -- cgit v1.1