diff options
| author | UbitUmarov | 2017-06-06 00:30:01 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-06-06 00:30:01 +0100 |
| commit | 258d169392bc3c46773a6cd3eddd48303087499d (patch) | |
| tree | 0c3ee808de175f90d163603789693ab3e9786cfd /OpenSim | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Correct parsing of 'Media' XML element in PrimitiveBaseShape when reading an ... (diff) | |
| download | opensim-SC-258d169392bc3c46773a6cd3eddd48303087499d.zip opensim-SC-258d169392bc3c46773a6cd3eddd48303087499d.tar.gz opensim-SC-258d169392bc3c46773a6cd3eddd48303087499d.tar.bz2 opensim-SC-258d169392bc3c46773a6cd3eddd48303087499d.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 892403b..b1b1fc5 100644 --- 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 | |||
| 1361 | 1361 | ||
| 1362 | private static void ProcessShpMedia(PrimitiveBaseShape shp, XmlReader reader) | 1362 | private static void ProcessShpMedia(PrimitiveBaseShape shp, XmlReader reader) |
| 1363 | { | 1363 | { |
| 1364 | string value = reader.ReadElementContentAsString("Media", String.Empty); | 1364 | // Get inner XML and pass to MediaList parser |
| 1365 | string value = reader.ReadInnerXml(); | ||
| 1365 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); | 1366 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); |
| 1366 | } | 1367 | } |
| 1367 | 1368 | ||