diff options
author | MW | 2007-08-07 17:22:15 +0000 |
---|---|---|
committer | MW | 2007-08-07 17:22:15 +0000 |
commit | 5ac5785cf2af152b44d8faeb3207b671b81c6684 (patch) | |
tree | 82e06b144d96d5d5e711a1e7e60e89d1a3810181 /OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | |
parent | * Removed duplicated Script residue (diff) | |
download | opensim-SC-5ac5785cf2af152b44d8faeb3207b671b81c6684.zip opensim-SC-5ac5785cf2af152b44d8faeb3207b671b81c6684.tar.gz opensim-SC-5ac5785cf2af152b44d8faeb3207b671b81c6684.tar.bz2 opensim-SC-5ac5785cf2af152b44d8faeb3207b671b81c6684.tar.xz |
a couple of changes in the new Sceneobject classes, just committing so things are kept in sync.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectGroup2.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
64 | 64 | ||
65 | this.Pos = pos; | 65 | this.Pos = pos; |
66 | LLVector3 rootOffset = new LLVector3(0, 0, 0); | 66 | LLVector3 rootOffset = new LLVector3(0, 0, 0); |
67 | AllNewSceneObjectPart2 newPart = new AllNewSceneObjectPart2(m_regionHandle, this, ownerID, localID, shape, rootOffset); | 67 | AllNewSceneObjectPart2 newPart = new AllNewSceneObjectPart2(m_regionHandle, this, ownerID, localID, shape, pos, rootOffset); |
68 | this.m_parts.Add(newPart.UUID, newPart); | 68 | this.m_parts.Add(newPart.UUID, newPart); |
69 | this.SetPartAsRoot(newPart); | 69 | this.SetPartAsRoot(newPart); |
70 | } | 70 | } |
@@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
293 | proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0"); | 293 | proper.ObjectData[0].TouchName = enc.GetBytes(this.m_rootPart.TouchName + "\0"); |
294 | proper.ObjectData[0].TextureID = new byte[0]; | 294 | proper.ObjectData[0].TextureID = new byte[0]; |
295 | proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0"); | 295 | proper.ObjectData[0].SitName = enc.GetBytes(this.m_rootPart.SitName + "\0"); |
296 | proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.Name + "\0"); | 296 | proper.ObjectData[0].Name = enc.GetBytes(this.m_rootPart.PartName + "\0"); |
297 | proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0"); | 297 | proper.ObjectData[0].Description = enc.GetBytes(this.m_rootPart.Description + "\0"); |
298 | proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask; | 298 | proper.ObjectData[0].OwnerMask = this.m_rootPart.OwnerMask; |
299 | proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask; | 299 | proper.ObjectData[0].NextOwnerMask = this.m_rootPart.NextOwnerMask; |