From 5aa56b12743c19a68cb371609be797e5fb3e2c4b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 28 Jul 2010 18:55:29 +0100
Subject: Fix problem where changes to media textures for prims duplicated by
 shify copy would change both prims until server restart

I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 444a239..085da19 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1617,7 +1617,24 @@ namespace OpenSim.Region.Framework.Scenes
                 dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
             }
             
-            return dupe;
+            if (Shape.Media != null)
+            {
+                List<MediaEntry> dupeMedia = new List<MediaEntry>();
+                
+                foreach (MediaEntry me in Shape.Media)
+                {
+                    if (me != null)
+                        dupeMedia.Add(MediaEntry.FromOSD(me.GetOSD()));
+                    else
+                        dupeMedia.Add(null);
+                }
+                
+                dupe.Shape.Media = dupeMedia;
+            }
+
+//            m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID);
+                          
+            return dupe;            
         }
 
         protected void AssetReceived(string id, Object sender, AssetBase asset)
-- 
cgit v1.1