aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs10
-rw-r--r--OpenSim/Services/FSAssetService/FSAssetService.cs2
-rw-r--r--OpenSim/Services/GridService/GridService.cs4
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs2
7 files changed, 16 insertions, 18 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 }
diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs
index ca2f459..812d89d 100644
--- a/OpenSim/Services/FSAssetService/FSAssetService.cs
+++ b/OpenSim/Services/FSAssetService/FSAssetService.cs
@@ -231,7 +231,7 @@ namespace OpenSim.Services.FSAssetService
231 double avg = (double)m_readTicks / (double)m_readCount; 231 double avg = (double)m_readTicks / (double)m_readCount;
232// if (avg > 10000) 232// if (avg > 10000)
233// Environment.Exit(0); 233// Environment.Exit(0);
234 m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS); 234//// m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS);
235 } 235 }
236 m_readCount = 0; 236 m_readCount = 0;
237 m_readTicks = 0; 237 m_readTicks = 0;
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index a5c7d34..2a2d8a8 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -345,7 +345,7 @@ namespace OpenSim.Services.GridService
345 m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e); 345 m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e);
346 } 346 }
347 347
348 m_log.DebugFormat 348 m_log.InfoFormat
349 ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", 349 ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}",
350 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, 350 regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY,
351 regionInfos.RegionCoordX, regionInfos.RegionCoordY, 351 regionInfos.RegionCoordX, regionInfos.RegionCoordY,
@@ -374,7 +374,7 @@ namespace OpenSim.Services.GridService
374 if (region == null) 374 if (region == null)
375 return false; 375 return false;
376 376
377 m_log.DebugFormat( 377 m_log.InfoFormat(
378 "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}", 378 "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}",
379 region.RegionName, region.RegionID, region.coordX, region.coordY); 379 region.RegionName, region.RegionID, region.coordX, region.coordY);
380 380
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index ae92919..0392409 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Services.PresenceService
88 { 88 {
89 PresenceInfo presence = GetAgent(sessionID); 89 PresenceInfo presence = GetAgent(sessionID);
90 90
91 m_log.DebugFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}", 91 m_log.InfoFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}",
92 sessionID, 92 sessionID,
93 (presence == null) ? null : presence.UserID, 93 (presence == null) ? null : presence.UserID,
94 (presence == null) ? null : presence.RegionID.ToString()); 94 (presence == null) ? null : presence.RegionID.ToString());