Merge branch 'master' into httptests

2017-06-06 00:30:01 +01:00 · 2017-06-06 00:30:01 +01:00 · 258d169392
parent aea282ba38 fa5bf4fd0b
commit 258d169392
1 changed files with 2 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@ -1361,7 +1361,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization

        private static void ProcessShpMedia(PrimitiveBaseShape shp, XmlReader reader)
        {
-            string value = reader.ReadElementContentAsString("Media", String.Empty);
+            // Get inner XML and pass to MediaList parser
+            string value = reader.ReadInnerXml();
            shp.Media = PrimitiveBaseShape.MediaList.FromXml(value);
        }