aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorCharles Krinke2007-11-01 03:56:54 +0000
committerCharles Krinke2007-11-01 03:56:54 +0000
commit8af272b3abdb4ecc64fa7cf46ef0205e4398f01c (patch)
tree4100dee3fdad35cce23ce4cb645fa443bf7c90da /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parentThank you Melanie for a patch to SceneObjectPart.cs so that on first transmis... (diff)
downloadopensim-SC_OLD-8af272b3abdb4ecc64fa7cf46ef0205e4398f01c.zip
opensim-SC_OLD-8af272b3abdb4ecc64fa7cf46ef0205e4398f01c.tar.gz
opensim-SC_OLD-8af272b3abdb4ecc64fa7cf46ef0205e4398f01c.tar.bz2
opensim-SC_OLD-8af272b3abdb4ecc64fa7cf46ef0205e4398f01c.tar.xz
Thank you, Melanie for solving: When receiving an ObjectAdd packet, the Rotation member is silently ignored and the prim is created with 0,0,0,1 rotation. The patch introduces a fix that passes the Rotation parameter from the packet to the object and uses it in the actual object creation.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs14
1 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 2f86d2f..aaa25e7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Region.Environment.Scenes
322 /// 322 ///
323 /// </summary> 323 /// </summary>
324 public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos, 324 public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos,
325 PrimitiveBaseShape shape) 325 LLQuaternion rot, PrimitiveBaseShape shape)
326 { 326 {
327 m_regionHandle = regionHandle; 327 m_regionHandle = regionHandle;
328 m_scene = scene; 328 m_scene = scene;
@@ -330,13 +330,21 @@ namespace OpenSim.Region.Environment.Scenes
330 // this.Pos = pos; 330 // this.Pos = pos;
331 LLVector3 rootOffset = new LLVector3(0, 0, 0); 331 LLVector3 rootOffset = new LLVector3(0, 0, 0);
332 SceneObjectPart newPart = 332 SceneObjectPart newPart =
333 new SceneObjectPart(m_regionHandle, this, ownerID, localID, shape, pos, rootOffset); 333 new SceneObjectPart(m_regionHandle, this, ownerID, localID, shape, pos, rot, rootOffset);
334 m_parts.Add(newPart.UUID, newPart); 334 m_parts.Add(newPart.UUID, newPart);
335 SetPartAsRoot(newPart); 335 SetPartAsRoot(newPart);
336 336
337 AttachToBackup(); 337 AttachToBackup();
338 } 338 }
339 339
340 /// <summary>
341 ///
342 /// </summary>
343 public SceneObjectGroup(Scene scene, ulong regionHandle, LLUUID ownerID, uint localID, LLVector3 pos,
344 PrimitiveBaseShape shape):this(scene, regionHandle, ownerID, localID, pos, LLQuaternion.Identity, shape)
345 {
346 }
347
340 #endregion 348 #endregion
341 349
342 public string ToXmlString() 350 public string ToXmlString()
@@ -1386,4 +1394,4 @@ namespace OpenSim.Region.Environment.Scenes
1386 Text = text; 1394 Text = text;
1387 } 1395 }
1388 } 1396 }
1389} \ No newline at end of file 1397}