diff options
author | Justin Clarke Casey | 2008-02-20 17:34:10 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-02-20 17:34:10 +0000 |
commit | 877713999ce9bcf63e9fafa76cc7d2283ee2e6c2 (patch) | |
tree | a777abaadb3556af6933a5ac6fa85af6647629ed /OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |
parent | llSetTimerEvent was setting seconds as milliseconds causing major problems in... (diff) | |
download | opensim-SC-877713999ce9bcf63e9fafa76cc7d2283ee2e6c2.zip opensim-SC-877713999ce9bcf63e9fafa76cc7d2283ee2e6c2.tar.gz opensim-SC-877713999ce9bcf63e9fafa76cc7d2283ee2e6c2.tar.bz2 opensim-SC-877713999ce9bcf63e9fafa76cc7d2283ee2e6c2.tar.xz |
* Report 'asset not found' situations back to UserTextureDownloadService
* This fixes some of the 'runaway downloads' problem but not all of it
* Also fix up logging messages so texture requests are reported as such rather than as assets
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 4 |
1 files changed, 2 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 | ||