aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
authoronefang2020-09-09 04:33:43 +1000
committeronefang2020-09-09 04:33:43 +1000
commit0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d (patch)
tree2abffa5e6450eb654f1aa21f9ed46d5cf7a4d7c1 /OpenSim/Region/Framework/Scenes/Serialization
parentUpdate version number stuff, and hack it into the money display. (diff)
downloadopensim-SC-0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d.zip
opensim-SC-0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d.tar.gz
opensim-SC-0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d.tar.bz2
opensim-SC-0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d.tar.xz
Various logging fix ups.
Mostly removing console spam. Swap a bunch of info / debug logs. Better archiver console spam. Have some "avatar has left" mesasge hit the INFO console. Tweak the login logging a bit, especially for impersonations. Default to INFO on the console and DEBUG in the log files. More time stamp resolution. Better sim startup console notification. Attempt to render "[LLUDPSERVER]: Malformed data, cannot parse" into something human readable as an aid to diagnosis. Beats hand translating the big block of hex codes it was spewing. Better sim startup finished messages. Inform neighbours we are up before the finished messages. Always send the "[RegionReady]: INITIALIZATION COMPLETE FOR" message.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs7
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs14
2 files changed, 12 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 41f3ef4..5302e8b 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -176,10 +176,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
176 i++; 176 i++;
177 } 177 }
178 } 178 }
179 catch (Exception e) 179 catch /*(Exception e)*/
180 { 180 {
181 m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); 181 m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ");
182 Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); 182//// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e);
183//// Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml);
183 return false; 184 return false;
184 } 185 }
185 186
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index ae8f6f6..d9a1f93 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -69,10 +69,11 @@ 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 ", e); 74 m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
75 Util.LogFailedXML("[SERIALIZER]:", fixedData); 75//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
76//// Util.LogFailedXML("[SERIALIZER]:", fixedData);
76 return null; 77 return null;
77 } 78 }
78 } 79 }
@@ -307,10 +308,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
307// sceneObject.AggregatePerms(); 308// sceneObject.AggregatePerms();
308 return sceneObject; 309 return sceneObject;
309 } 310 }
310 catch (Exception e) 311 catch /*(Exception e)*/
311 { 312 {
312 m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); 313 m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
313 Util.LogFailedXML("[SERIALIZER]:", xmlData); 314//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
315//// Util.LogFailedXML("[SERIALIZER]:", xmlData);
314 return null; 316 return null;
315 } 317 }
316 } 318 }