Prim Copying (both CTRL+D and shift-drag) should now work.

3 files changed, 66 insertions, 44 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index ab50373..e20870f 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -163,21 +163,33 @@ namespace OpenSim.Region.Environment.Scenes
             dupe.inventoryItems = this.inventoryItems;

             dupe.m_Parent = parent;

             dupe.m_RootParent = rootParent;

-            // TODO: Copy this properly.

+

             dupe.m_Shape = this.m_Shape.Copy();

             dupe.children = new List<EntityBase>();

             uint newLocalID = this.m_world.PrimIDAllocate();

             dupe.uuid = LLUUID.Random();

             dupe.LocalId = newLocalID;

+            dupe.m_regionHandle = this.m_regionHandle;

+

+            if (parent is SceneObject)

+            {

+               dupe.m_isRootPrim = true;

+                dupe.ParentID = 0;

+            }

+            else

+            {

+                dupe.m_isRootPrim = false;

+                dupe.ParentID = ((Primitive)parent).LocalId;

+            }

 

             dupe.Scale = new LLVector3(this.Scale.X, this.Scale.Y, this.Scale.Z);

             dupe.Rotation = new Quaternion(this.Rotation.w, this.Rotation.x, this.Rotation.y, this.Rotation.z);

-            dupe.Pos = new LLVector3(this.Pos.X, this.Pos.Y, this.Pos.Z);

+            dupe.m_pos = new LLVector3(this.m_pos.X, this.m_pos.Y, this.m_pos.Z);

             rootParent.AddChildToList(dupe);

             

             foreach (Primitive prim in this.children)

             {

-                Primitive primClone = prim.Copy(this, rootParent);

+                Primitive primClone = prim.Copy(dupe, rootParent);

                 dupe.children.Add(primClone);

             }

 

diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 14bf87c..b86e5c8 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="fromAgentID"></param>

         public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

         {

-           // Console.WriteLine("Chat message");

+            // Console.WriteLine("Chat message");

             ScenePresence avatar = null;

 

             m_clientManager.ForEachClient(delegate(IClientAPI client)

@@ -149,7 +149,7 @@ namespace OpenSim.Region.Environment.Scenes
                                                   {

                                                       avatar = this.Avatars[client.AgentId];

                                                       // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));

-                                                      dis = (int) avatar.Pos.GetDistanceTo(fromPos);

+                                                      dis = (int)avatar.Pos.GetDistanceTo(fromPos);

                                                       //Console.WriteLine("found avatar at " +dis);

                                                   }

 

@@ -194,7 +194,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="pos"></param>

         public void RezObject(AssetBase primAsset, LLVector3 pos)

         {

-          

+

         }

 

         /// <summary>

@@ -204,7 +204,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="simClient"></param>

         public void DeRezObject(Packet packet, IClientAPI simClient)

         {

-           

+

         }

 

         /// <summary>

@@ -213,7 +213,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteClient"></param>

         public void SendAvatarsToClient(IClientAPI remoteClient)

         {

-            

+

         }

 

         /// <summary>

@@ -239,7 +239,15 @@ namespace OpenSim.Region.Environment.Scenes
 

             if (originPrim != null)

             {

-                //SceneObject copy = originPrim.Copy();

+                SceneObject copy = originPrim.Copy();

+                copy.Pos = copy.Pos + offset;

+                this.Entities.Add(copy.rootUUID, copy);

+

+                List<ScenePresence> avatars = this.RequestAvatarList();

+                for (int i = 0; i < avatars.Count; i++)

+                {

+                    copy.SendAllChildPrimsToClient(avatars[i].ControllingClient);

+                }

 

             }

             else

@@ -256,7 +264,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="childPrims"></param>

         public void LinkObjects(uint parentPrim, List<uint> childPrims)

         {

-            SceneObject parenPrim = null; 

+            SceneObject parenPrim = null;

             foreach (EntityBase ent in Entities.Values)

             {

                 if (ent is SceneObject)

@@ -328,7 +336,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {

                     if (((SceneObject)ent).rootLocalID == primLocalID)

                     {

-                      ((SceneObject)ent).GetProperites(remoteClient);

+                        ((SceneObject)ent).GetProperites(remoteClient);

                         break;

                     }

                 }

@@ -342,7 +350,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="description"></param>

         public void PrimDescription(uint primLocalID, string description)

         {

-           Primitive prim = null;

+            Primitive prim = null;

             foreach (EntityBase ent in Entities.Values)

             {

                 if (ent is SceneObject)

@@ -350,7 +358,7 @@ namespace OpenSim.Region.Environment.Scenes
                     prim = ((SceneObject)ent).HasChildPrim(primLocalID);

                     if (prim != null)

                     {

-                         prim.Description = description;

+                        prim.Description = description;

                         break;

                     }

                 }

@@ -381,19 +389,19 @@ namespace OpenSim.Region.Environment.Scenes
 

         public void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 pos, IClientAPI remoteClient)

         {

-             Primitive prim = null;

-             foreach (EntityBase ent in Entities.Values)

-             {

-                 if (ent is SceneObject)

-                 {

-                     prim = ((SceneObject)ent).HasChildPrim(objectID);

-                     if (prim != null)

-                     {

-                         ((SceneObject)ent).GrapMovement(offset, pos, remoteClient);

-                         break;

-                     }

-                 }

-             }

+            Primitive prim = null;

+            foreach (EntityBase ent in Entities.Values)

+            {

+                if (ent is SceneObject)

+                {

+                    prim = ((SceneObject)ent).HasChildPrim(objectID);

+                    if (prim != null)

+                    {

+                        ((SceneObject)ent).GrapMovement(offset, pos, remoteClient);

+                        break;

+                    }

+                }

+            }

             /*

             if (this.Entities.ContainsKey(objectID))

             {

@@ -412,7 +420,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteClient"></param>

         public void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient)

         {

-           

+

         }

 

         /// <summary>

@@ -423,18 +431,18 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteClient"></param>

         public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)

         {

-             Primitive prim = null;

-             foreach (EntityBase ent in Entities.Values)

-             {

-                 if (ent is SceneObject)

-                 {

-                     prim = ((SceneObject)ent).HasChildPrim(localID);

-                     if (prim != null)

-                     {

-                         prim.UpdateTextureEntry(texture);

-                     }

-                 }

-             }

+            Primitive prim = null;

+            foreach (EntityBase ent in Entities.Values)

+            {

+                if (ent is SceneObject)

+                {

+                    prim = ((SceneObject)ent).HasChildPrim(localID);

+                    if (prim != null)

+                    {

+                        prim.UpdateTextureEntry(texture);

+                    }

+                }

+            }

         }

 

         /// <summary>

@@ -494,7 +502,7 @@ namespace OpenSim.Region.Environment.Scenes
                     prim = ((SceneObject)ent).HasChildPrim(localID);

                     if (prim != null)

                     {

-                        prim.UpdateGroupMouseRotation( pos, rot);

+                        prim.UpdateGroupMouseRotation(pos, rot);

                         break;

                     }

                 }

@@ -532,7 +540,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteClient"></param>

         public void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient)

         {

-           //Console.WriteLine("trying to update single prim rotation");

+            //Console.WriteLine("trying to update single prim rotation");

             Primitive prim = null;

             foreach (EntityBase ent in Entities.Values)

             {

diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index e979186..d507a98 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -117,11 +117,13 @@ namespace OpenSim.Region.Environment.Scenes
 

             dupe.m_world = this.m_world;

             dupe.m_regionHandle = this.m_regionHandle;

-            Primitive newRoot = this.rootPrimitive.Copy((EntityBase)dupe, dupe);

+            Primitive newRoot = this.rootPrimitive.Copy(dupe, dupe);

             dupe.rootPrimitive = newRoot;

-            dupe.rootPrimitive.Pos =( this.Pos + new LLVector3(0,0,1));

+            dupe.children.Add(dupe.rootPrimitive);

+            dupe.rootPrimitive.Pos = this.Pos;

             dupe.Rotation = this.Rotation;

-

+           LLUUID rootu=  dupe.rootUUID;

+           uint rooti = dupe.rootLocalID;

             return dupe;

         }