diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SimStatsReporter.cs | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 17c4d6d..dc95002 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |||
@@ -160,7 +160,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
160 | 160 | ||
161 | cache.GetAsset(item.AssetID, delegate(LLUUID assetID, AssetBase asset) | 161 | cache.GetAsset(item.AssetID, delegate(LLUUID assetID, AssetBase asset) |
162 | { | 162 | { |
163 | if (asset.FullID == LLUUID.Zero) | 163 | if (null == asset) |
164 | { | 164 | { |
165 | m_log.ErrorFormat( | 165 | m_log.ErrorFormat( |
166 | "[PRIMINVENTORY]: " + | 166 | "[PRIMINVENTORY]: " + |
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
174 | m_parentGroup.AddActiveScriptCount(1); | 174 | m_parentGroup.AddActiveScriptCount(1); |
175 | ScheduleFullUpdate(); | 175 | ScheduleFullUpdate(); |
176 | } | 176 | } |
177 | }); | 177 | }, false); |
178 | } | 178 | } |
179 | } | 179 | } |
180 | 180 | ||
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs index a0539f0..422189e 100644 --- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs | |||
@@ -363,9 +363,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
363 | { | 363 | { |
364 | m_otherMS += ms; | 364 | m_otherMS += ms; |
365 | } | 365 | } |
366 | |||
367 | // private static readonly log4net.ILog m_log | ||
368 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
369 | |||
366 | public void addPendingDownload(int count) | 370 | public void addPendingDownload(int count) |
367 | { | 371 | { |
368 | m_pendingDownloads += count; | 372 | m_pendingDownloads += count; |
373 | //m_log.InfoFormat("Adding {0} to pending downloads to make {1}", count, m_pendingDownloads); | ||
369 | } | 374 | } |
370 | 375 | ||
371 | public void addScriptLines(int count) | 376 | public void addScriptLines(int count) |