diff options
author | onefang | 2019-06-04 00:50:59 +1000 |
---|---|---|
committer | onefang | 2019-06-04 00:50:59 +1000 |
commit | cdb1851f438349a8721c0d9cef54837d0b302189 (patch) | |
tree | 1a1c7255ac4343ecf44bdd5387903f467a6b7626 /OpenSim/Region/Framework/Scenes/Serialization | |
parent | Adjust [AuthorizationService] sections to use the new DefaultRegionAccess. (diff) | |
download | opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.zip opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.gz opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.bz2 opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.xz |
Warnings--
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index 4024fea..8fa4409 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
179 | i++; | 179 | i++; |
180 | } | 180 | } |
181 | } | 181 | } |
182 | catch (Exception e) | 182 | catch /*(Exception e)*/ |
183 | { | 183 | { |
184 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); | 184 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); |
185 | //// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); | 185 | //// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index c2b075c..ab70010 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
69 | { | 69 | { |
70 | return FromOriginalXmlFormat(reader); | 70 | return FromOriginalXmlFormat(reader); |
71 | } | 71 | } |
72 | catch (Exception e) | 72 | catch /*(Exception e)*/ |
73 | { | 73 | { |
74 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); | 74 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
75 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 75 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
@@ -314,7 +314,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
314 | // sceneObject.AggregatePerms(); | 314 | // sceneObject.AggregatePerms(); |
315 | return sceneObject; | 315 | return sceneObject; |
316 | } | 316 | } |
317 | catch (Exception e) | 317 | catch /*(Exception e)*/ |
318 | { | 318 | { |
319 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); | 319 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
320 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 320 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
@@ -1402,7 +1402,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1402 | value = reader.ReadElementContentAsString("Media", String.Empty); | 1402 | value = reader.ReadElementContentAsString("Media", String.Empty); |
1403 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); | 1403 | shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); |
1404 | } | 1404 | } |
1405 | catch (XmlException e) | 1405 | catch (XmlException) |
1406 | { | 1406 | { |
1407 | // There are versions of OAR files that contain unquoted XML. | 1407 | // There are versions of OAR files that contain unquoted XML. |
1408 | // ie ONE comercial fork that never wanted their oars to be read by our code | 1408 | // ie ONE comercial fork that never wanted their oars to be read by our code |