diff options
author | Justin Clark-Casey (justincc) | 2010-07-28 18:55:29 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-28 18:55:29 +0100 |
commit | 5aa56b12743c19a68cb371609be797e5fb3e2c4b (patch) | |
tree | 4b9b23b0e4de1397e16eaa6cd03baa8edfedd7b3 /OpenSim/Region/Framework/Scenes | |
parent | comment out further debug line in BaseHttpServer (diff) | |
download | opensim-SC-5aa56b12743c19a68cb371609be797e5fb3e2c4b.zip opensim-SC-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.gz opensim-SC-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.bz2 opensim-SC-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.xz |
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
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 19 |
1 files changed, 18 insertions, 1 deletions
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 | |||
1617 | dupe.DoPhysicsPropertyUpdate(UsePhysics, true); | 1617 | dupe.DoPhysicsPropertyUpdate(UsePhysics, true); |
1618 | } | 1618 | } |
1619 | 1619 | ||
1620 | return dupe; | 1620 | if (Shape.Media != null) |
1621 | { | ||
1622 | List<MediaEntry> dupeMedia = new List<MediaEntry>(); | ||
1623 | |||
1624 | foreach (MediaEntry me in Shape.Media) | ||
1625 | { | ||
1626 | if (me != null) | ||
1627 | dupeMedia.Add(MediaEntry.FromOSD(me.GetOSD())); | ||
1628 | else | ||
1629 | dupeMedia.Add(null); | ||
1630 | } | ||
1631 | |||
1632 | dupe.Shape.Media = dupeMedia; | ||
1633 | } | ||
1634 | |||
1635 | // m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID); | ||
1636 | |||
1637 | return dupe; | ||
1621 | } | 1638 | } |
1622 | 1639 | ||
1623 | protected void AssetReceived(string id, Object sender, AssetBase asset) | 1640 | protected void AssetReceived(string id, Object sender, AssetBase asset) |