Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2017-06-06 00:30:01 +01:00

View File

@@ -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);
}