diff options
| author | UbitUmarov | 2017-06-08 11:45:33 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-06-08 11:45:33 +0100 |
| commit | 29f2421d4f0f0852dbb5d8a99bcba4aecade9dc0 (patch) | |
| tree | d4e16a833606c56cd1e2d92f7e651e903002a185 /OpenSim/Region/Framework/Scenes/Serialization | |
| parent | so no real need for Maintenance thread.. so removed (diff) | |
| download | opensim-SC_OLD-29f2421d4f0f0852dbb5d8a99bcba4aecade9dc0.zip opensim-SC_OLD-29f2421d4f0f0852dbb5d8a99bcba4aecade9dc0.tar.gz opensim-SC_OLD-29f2421d4f0f0852dbb5d8a99bcba4aecade9dc0.tar.bz2 opensim-SC_OLD-29f2421d4f0f0852dbb5d8a99bcba4aecade9dc0.tar.xz | |
revert fa5bf4fd0bb6a855eacdb7b5eec9cd71ad9bf606 for test
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index b1b1fc5..892403b 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
| @@ -1361,8 +1361,7 @@ 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 | // Get inner XML and pass to MediaList parser | 1364 | string value = reader.ReadElementContentAsString("Media", String.Empty); |
| 1365 | string value = reader.ReadInnerXml(); | ||
| 1366 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); | 1365 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); |
| 1367 | } | 1366 | } |
| 1368 | 1367 | ||