2 files changed, 43 insertions, 47 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 610bfd1..fb0ec29 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -673,6 +673,8 @@ namespace OpenSim.Region.ClientStack
             OutPacket(loadURL);
         }
 
+        #endregion
+
         #region Appearance/ Wearables Methods
 
         /// <summary>
@@ -817,44 +819,33 @@ namespace OpenSim.Region.ClientStack
             this.OutPacket(attach);
         }
        
-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem)
+        public void SendPrimitiveToClient(
+            ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, 
+            LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem, LLQuaternion rotation)
         {
             ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
             outPacket.RegionData.RegionHandle = regionHandle;
             outPacket.RegionData.TimeDilation = timeDilation;
             outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            
             outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primShape, flags);
+            
             outPacket.ObjectData[0].ID = localID;
             outPacket.ObjectData[0].FullID = objectID;
             outPacket.ObjectData[0].OwnerID = ownerID;
             outPacket.ObjectData[0].Text = Helpers.StringToField( text );
             outPacket.ObjectData[0].ParentID = parentID;
             outPacket.ObjectData[0].PSBlock = particleSystem;
+            
             byte[] pb = pos.GetBytes();
             Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+            
             byte[] rot = rotation.GetBytes();
             Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 36, rot.Length);
+            
             OutPacket(outPacket);
         }
 
-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem)
-        {
-            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
-            outPacket.RegionData.RegionHandle = regionHandle;
-            outPacket.RegionData.TimeDilation = timeDilation;
-            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
-            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primShape, flags);
-            outPacket.ObjectData[0].ID = localID;
-            outPacket.ObjectData[0].FullID = objectID;
-            outPacket.ObjectData[0].OwnerID = ownerID;
-            outPacket.ObjectData[0].Text = Helpers.StringToField( text );
-            outPacket.ObjectData[0].ParentID = parentID;
-            outPacket.ObjectData[0].PSBlock = particleSystem;
-            byte[] pb = pos.GetBytes();
-            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
-
-            OutPacket(outPacket);
-        }
         /// <summary>
         /// 
         /// </summary>
@@ -876,8 +867,6 @@ namespace OpenSim.Region.ClientStack
 
         #endregion
 
-        #endregion
-
         #region Helper Methods
 
         protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateAvatarImprovedBlock(uint localID, LLVector3 pos, LLVector3 velocity)
@@ -1163,8 +1152,6 @@ namespace OpenSim.Region.ClientStack
             objdata.ObjectData[64] = 189;
         }
 
-        #endregion
-
         public void SendNameReply(LLUUID profileId, string firstname, string lastname)
         {
             UUIDNameReplyPacket packet = new UUIDNameReplyPacket();
@@ -1177,5 +1164,8 @@ namespace OpenSim.Region.ClientStack
             
             OutPacket( packet );
         }
+
+        #endregion
+
     }
 }
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index c0c14ee..5ad35ff 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -218,30 +218,7 @@ namespace OpenSim.Region.ClientStack
                         if (OnAddPrim != null)
                         {
                             ObjectAddPacket addPacket = (ObjectAddPacket) Pack ;
-                            PrimitiveBaseShape shape = new PrimitiveBaseShape();
-
-                            shape.PCode = addPacket.ObjectData.PCode;
-                            shape.PathBegin = addPacket.ObjectData.PathBegin;
-                            shape.PathEnd = addPacket.ObjectData.PathEnd;
-                            shape.PathScaleX = addPacket.ObjectData.PathScaleX;
-                            shape.PathScaleY = addPacket.ObjectData.PathScaleY;
-                            shape.PathShearX = addPacket.ObjectData.PathShearX;
-                            shape.PathShearY = addPacket.ObjectData.PathShearY;
-                            shape.PathSkew = addPacket.ObjectData.PathSkew;
-                            shape.ProfileBegin = addPacket.ObjectData.ProfileBegin;
-                            shape.ProfileEnd = addPacket.ObjectData.ProfileEnd;
-                            shape.Scale = addPacket.ObjectData.Scale;
-                            shape.PathCurve = addPacket.ObjectData.PathCurve;
-                            shape.ProfileCurve = addPacket.ObjectData.ProfileCurve;
-                            shape.ProfileHollow = addPacket.ObjectData.ProfileHollow;
-                            shape.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
-                            shape.PathRevolutions = addPacket.ObjectData.PathRevolutions;
-                            shape.PathTaperX = addPacket.ObjectData.PathTaperX;
-                            shape.PathTaperY = addPacket.ObjectData.PathTaperY;
-                            shape.PathTwist = addPacket.ObjectData.PathTwist;
-                            shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
-                            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
-                            shape.TextureEntry = ntex.ToBytes();
+                            PrimitiveBaseShape shape = GetShapeFromAddPacket(addPacket);
 
                             OnAddPrim(this.AgentId, addPacket.ObjectData.RayEnd, shape);
                         }
@@ -624,5 +601,34 @@ namespace OpenSim.Region.ClientStack
                 }
             }
         }
+
+        private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket)
+        {
+            PrimitiveBaseShape shape = new PrimitiveBaseShape();
+
+            shape.PCode = addPacket.ObjectData.PCode;
+            shape.PathBegin = addPacket.ObjectData.PathBegin;
+            shape.PathEnd = addPacket.ObjectData.PathEnd;
+            shape.PathScaleX = addPacket.ObjectData.PathScaleX;
+            shape.PathScaleY = addPacket.ObjectData.PathScaleY;
+            shape.PathShearX = addPacket.ObjectData.PathShearX;
+            shape.PathShearY = addPacket.ObjectData.PathShearY;
+            shape.PathSkew = addPacket.ObjectData.PathSkew;
+            shape.ProfileBegin = addPacket.ObjectData.ProfileBegin;
+            shape.ProfileEnd = addPacket.ObjectData.ProfileEnd;
+            shape.Scale = addPacket.ObjectData.Scale;
+            shape.PathCurve = addPacket.ObjectData.PathCurve;
+            shape.ProfileCurve = addPacket.ObjectData.ProfileCurve;
+            shape.ProfileHollow = addPacket.ObjectData.ProfileHollow;
+            shape.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
+            shape.PathRevolutions = addPacket.ObjectData.PathRevolutions;
+            shape.PathTaperX = addPacket.ObjectData.PathTaperX;
+            shape.PathTaperY = addPacket.ObjectData.PathTaperY;
+            shape.PathTwist = addPacket.ObjectData.PathTwist;
+            shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
+            shape.TextureEntry = ntex.ToBytes();
+            return shape;
+        }
     }
 }