diff options
Diffstat (limited to 'OpenSim/Region')
4 files changed, 12 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 3092fe0..0a955c5 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs | |||
@@ -143,11 +143,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
143 | asset.Data); | 143 | asset.Data); |
144 | 144 | ||
145 | m_assetsWritten++; | 145 | m_assetsWritten++; |
146 | |||
147 | //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten); | ||
148 | |||
149 | if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0) | ||
150 | m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten); | ||
151 | } | 146 | } |
152 | 147 | ||
153 | } | 148 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index b3303a0..6e5ffde 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1691,9 +1691,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1691 | UUID copyID = UUID.Random(); | 1691 | UUID copyID = UUID.Random(); |
1692 | bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient); | 1692 | bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient); |
1693 | part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights); | 1693 | part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights); |
1694 | m_log.InfoFormat( | 1694 | //// m_log.InfoFormat( |
1695 | "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", | 1695 | //// "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", |
1696 | item.Name, primLocalID, remoteClient.Name); | 1696 | //// item.Name, primLocalID, remoteClient.Name); |
1697 | part.SendPropertiesToClient(remoteClient); | 1697 | part.SendPropertiesToClient(remoteClient); |
1698 | if (!Permissions.BypassPermissions()) | 1698 | if (!Permissions.BypassPermissions()) |
1699 | { | 1699 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index abcb573..4024fea 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | |||
@@ -181,8 +181,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
181 | } | 181 | } |
182 | catch (Exception e) | 182 | catch (Exception e) |
183 | { | 183 | { |
184 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); | 184 | m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); |
185 | Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); | 185 | //// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); |
186 | //// Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); | ||
186 | return false; | 187 | return false; |
187 | } | 188 | } |
188 | 189 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index c5a3a22..c2b075c 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -71,8 +71,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
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 | } |
@@ -315,8 +316,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
315 | } | 316 | } |
316 | catch (Exception e) | 317 | catch (Exception e) |
317 | { | 318 | { |
318 | m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); | 319 | m_log.Error("[SERIALIZER]: Deserialization of xml failed "); |
319 | Util.LogFailedXML("[SERIALIZER]:", xmlData); | 320 | //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); |
321 | //// Util.LogFailedXML("[SERIALIZER]:", xmlData); | ||
320 | return null; | 322 | return null; |
321 | } | 323 | } |
322 | } | 324 | } |