From 6cad71d5ec2f794f1df668e978049f7e5b10e9dc Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 24 Mar 2009 21:05:20 +0000
Subject: * minor: remove load oar logging I accidentally left in a few commits
ago * reduce noisiness of uuid gatherer * stop bothering to pointless
complain about directory tar entries when loading an oar
---
.../Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 12 ++++--------
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 ++--
2 files changed, 6 insertions(+), 10 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 5c9f755..8b603b4 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -110,12 +110,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
//m_log.DebugFormat(
// "[ARCHIVER]: Successfully read {0} ({1} bytes)}", filePath, data.Length);
- if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType)
- {
- m_log.WarnFormat(
- "[ARCHIVER]: Ignoring directory entry {0}", filePath);
- }
- else if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
+ if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH))
{
serialisedSceneObjects.Add(m_asciiEncoding.GetString(data));
}
@@ -172,18 +167,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
foreach (string serialisedSceneObject in serialisedSceneObjects)
{
+ /*
m_log.DebugFormat("[ARCHIVER]: Loading xml with raw size {0}", serialisedSceneObject.Length);
// Really large xml files (multi megabyte) appear to cause
// memory problems
// when loading the xml. But don't enable this check yet
-/*
+
if (serialisedSceneObject.Length > 5000000)
{
m_log.Error("[ARCHIVER]: Ignoring xml since size > 5000000);");
continue;
}
-*/
+ */
SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 7b2fae0..07a1cc7 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -110,8 +110,8 @@ namespace OpenSim.Region.Framework.Scenes
/// The assets gathered
public void GatherAssetUuids(SceneObjectGroup sceneObject, IDictionary assetUuids)
{
- m_log.DebugFormat(
- "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
+// m_log.DebugFormat(
+// "[ASSET GATHERER]: Getting assets for object {0}, {1}", sceneObject.Name, sceneObject.UUID);
foreach (SceneObjectPart part in sceneObject.GetParts())
{
--
cgit v1.1