diff options
author | MW | 2007-04-03 16:10:00 +0000 |
---|---|---|
committer | MW | 2007-04-03 16:10:00 +0000 |
commit | ba2c94721c2f3b9dc263ad6ca635aa8a9c521ba5 (patch) | |
tree | c8f650dc2492960b1fa234c751a1ac6f76ab650a /OpenSim.RegionServer/world | |
parent | Temporary fix for the object taking bug (diff) | |
download | opensim-SC-ba2c94721c2f3b9dc263ad6ca635aa8a9c521ba5.zip opensim-SC-ba2c94721c2f3b9dc263ad6ca635aa8a9c521ba5.tar.gz opensim-SC-ba2c94721c2f3b9dc263ad6ca635aa8a9c521ba5.tar.bz2 opensim-SC-ba2c94721c2f3b9dc263ad6ca635aa8a9c521ba5.tar.xz |
Limited (hacked) object linking. Note: once you have linked a set of prims together (in one go), then don't try to link anymore prims to those objects.
Diffstat (limited to 'OpenSim.RegionServer/world')
-rw-r--r-- | OpenSim.RegionServer/world/Primitive.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs index f60d991..156bbfb 100644 --- a/OpenSim.RegionServer/world/Primitive.cs +++ b/OpenSim.RegionServer/world/Primitive.cs | |||
@@ -246,7 +246,7 @@ namespace OpenSim.world | |||
246 | OurPacket.ObjectData[0].Scale = this.primData.Scale; | 246 | OurPacket.ObjectData[0].Scale = this.primData.Scale; |
247 | OurPacket.ObjectData[0].PathCurve = this.primData.PathCurve; | 247 | OurPacket.ObjectData[0].PathCurve = this.primData.PathCurve; |
248 | OurPacket.ObjectData[0].ProfileCurve = this.primData.ProfileCurve; | 248 | OurPacket.ObjectData[0].ProfileCurve = this.primData.ProfileCurve; |
249 | OurPacket.ObjectData[0].ParentID = 0; | 249 | OurPacket.ObjectData[0].ParentID = this.primData.ParentID ; |
250 | OurPacket.ObjectData[0].ProfileHollow = this.primData.ProfileHollow; | 250 | OurPacket.ObjectData[0].ProfileHollow = this.primData.ProfileHollow; |
251 | //finish off copying rest of shape data | 251 | //finish off copying rest of shape data |
252 | OurPacket.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset; | 252 | OurPacket.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset; |
@@ -316,6 +316,13 @@ namespace OpenSim.world | |||
316 | } | 316 | } |
317 | } | 317 | } |
318 | 318 | ||
319 | public void MakeParent(Primitive prim) | ||
320 | { | ||
321 | this.primData.ParentID = prim.localid; | ||
322 | this.position -= prim.position; | ||
323 | this.dirtyFlag = true; | ||
324 | } | ||
325 | |||
319 | public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID) | 326 | public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID) |
320 | { | 327 | { |
321 | ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); | 328 | ObjectUpdatePacket objupdate = new ObjectUpdatePacket(); |