diff options
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs index e4a2b21..9c8d294 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
29 | using System.Reflection; | 30 | using System.Reflection; |
30 | using log4net; | 31 | using log4net; |
@@ -152,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
152 | TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber); | 153 | TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber); |
153 | m_textureSenders.Add(e.RequestedAssetID, requestHandler); | 154 | m_textureSenders.Add(e.RequestedAssetID, requestHandler); |
154 | 155 | ||
155 | m_scene.CommsManager.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); | 156 | m_scene.AssetService.Get(e.RequestedAssetID.ToString(), this, TextureReceived); |
156 | } | 157 | } |
157 | } | 158 | } |
158 | } | 159 | } |
@@ -168,6 +169,12 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload | |||
168 | } | 169 | } |
169 | } | 170 | } |
170 | 171 | ||
172 | protected void TextureReceived(string id, Object sender, AssetBase asset) | ||
173 | { | ||
174 | if (asset != null) | ||
175 | TextureCallback(asset.FullID, asset); | ||
176 | } | ||
177 | |||
171 | /// <summary> | 178 | /// <summary> |
172 | /// The callback for the asset cache when a texture has been retrieved. This method queues the | 179 | /// The callback for the asset cache when a texture has been retrieved. This method queues the |
173 | /// texture sender for processing. | 180 | /// texture sender for processing. |