diff options
| author | UbitUmarov | 2018-01-15 16:23:19 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-01-15 16:23:19 +0000 |
| commit | c92ba1cc04c36d46b3569c06d8339cf897af65cc (patch) | |
| tree | 88fadaf244e29d229bc166c1b0ac031843b15a50 /OpenSim/Region/Framework/Scenes/Serialization | |
| parent | update PrimMesher to a newer version from dahlia (thx dahlia), targeted .net4.6 (diff) | |
| download | opensim-SC-c92ba1cc04c36d46b3569c06d8339cf897af65cc.zip opensim-SC-c92ba1cc04c36d46b3569c06d8339cf897af65cc.tar.gz opensim-SC-c92ba1cc04c36d46b3569c06d8339cf897af65cc.tar.bz2 opensim-SC-c92ba1cc04c36d46b3569c06d8339cf897af65cc.tar.xz | |
shut up some pesty warnings
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index a2d512a..66bf536 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
| @@ -1401,7 +1401,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 1401 | value = reader.ReadElementContentAsString("Media", String.Empty); | 1401 | value = reader.ReadElementContentAsString("Media", String.Empty); |
| 1402 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); | 1402 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); |
| 1403 | } | 1403 | } |
| 1404 | catch (XmlException e) | 1404 | catch (XmlException) |
| 1405 | { | 1405 | { |
| 1406 | // There are versions of OAR files that contain unquoted XML. | 1406 | // There are versions of OAR files that contain unquoted XML. |
| 1407 | // ie ONE comercial fork that never wanted their oars to be read by our code | 1407 | // ie ONE comercial fork that never wanted their oars to be read by our code |