Added Scene.ConvertLocalIDToFullID() method.

4 files changed, 47 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8ee5856..4aa3c49 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1023,5 +1023,23 @@ namespace OpenSim.Region.Environment.Scenes
             ScriptEngine.InitializeEngine(this);
         }
         #endregion
+
+        public LLUUID ConvertLocalIDToFullID(uint localID)
+        {
+             bool hasPrim = false;
+             foreach (EntityBase ent in Entities.Values)
+             {
+                 if (ent is SceneObjectGroup)
+                 {
+                     hasPrim = ((SceneObjectGroup)ent).HasChildPrim(localID);
+                     if (hasPrim != false)
+                     {
+                        return ((SceneObjectGroup)ent).GetPartsFullID(localID);
+                     }
+                 }
+             }
+
+             return null;
+        }
     }
 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index ad7b906..4f98199 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -825,5 +825,15 @@ namespace OpenSim.Region.Environment.Scenes
                 }
             }
         }
+
+        public LLUUID GetPartsFullID(uint localID)
+        {
+            SceneObjectPart part = this.GetChildPrim(localID);
+            if (part != null)
+            {
+                return part.UUID;
+            }
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c1348c7..09a864e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -300,7 +300,11 @@ namespace OpenSim.Region.Environment.Scenes
             dupe.Acceleration = new LLVector3(0, 0, 0);
             dupe.AngularVelocity = new LLVector3(0, 0, 0);
             dupe.ObjectFlags = this.ObjectFlags;
-            //TODO copy extraparams data and anything else not currently copied
+
+            byte[] extraP = new byte[this.Shape.ExtraParams.Length];
+            Array.Copy(this.Shape.ExtraParams, extraP, extraP.Length);
+            dupe.Shape.ExtraParams = extraP;
+
             return dupe;
         }
         #endregion
diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml
index d81b5b5..c3f061f 100644
--- a/bin/OpenSimAssetSet.xml
+++ b/bin/OpenSimAssetSet.xml
@@ -6,4 +6,18 @@
         <Key Name="inventoryType" Value="7" />

         <Key Name="fileName" Value="welcomeNote.dat" />

     </Section>

+    <Section Name="texture1">

+        <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" />

+        <Key Name="name" Value="femface" />

+        <Key Name="assetType" Value="0" />

+        <Key Name="inventoryType" Value="0" />

+        <Key Name="fileName" Value="femaleface.jp2" />

+    </Section>

+    <Section Name="test Object1">

+        <Key Name="assetID" Value="00000000-0000-8877-5566-000000000001" />

+        <Key Name="name" Value="test Object" />

+        <Key Name="assetType" Value="6" />

+        <Key Name="inventoryType" Value="6" />

+        <Key Name="fileName" Value="testObject.dat" />

+    </Section>

 </Nini>
\ No newline at end of file