aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
diff options
context:
space:
mode:
authordiva2009-05-15 05:00:25 +0000
committerdiva2009-05-15 05:00:25 +0000
commit5e4fc6e91e5edffd1dc23af4f583d6294f394a3d (patch)
tree497076db68193be2d14fc3788c1d80c74d8c977d /OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
parentsome sculpted prim geometry accuracy and meshing speed improvements (diff)
downloadopensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.zip
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.gz
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.bz2
opensim-SC_OLD-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.xz
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/ClientStack/LindenUDP/LLImageManager.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index 1aa0c75..a2160c6 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -31,6 +31,7 @@ using OpenMetaverse;
31using OpenMetaverse.Imaging; 31using OpenMetaverse.Imaging;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Services.Interfaces;
34using log4net; 35using log4net;
35using System.Reflection; 36using System.Reflection;
36 37
@@ -50,7 +51,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
50 private long m_lastloopprocessed = 0; 51 private long m_lastloopprocessed = 0;
51 52
52 private LLClientView m_client; //Client we're assigned to 53 private LLClientView m_client; //Client we're assigned to
53 private IAssetCache m_assetCache; //Asset Cache 54 private IAssetService m_assetCache; //Asset Cache
54 private IJ2KDecoder m_j2kDecodeModule; //Our J2K module 55 private IJ2KDecoder m_j2kDecodeModule; //Our J2K module
55 56
56 private readonly AssetBase m_missingsubstitute; //Sustitute for bad decodes 57 private readonly AssetBase m_missingsubstitute; //Sustitute for bad decodes
@@ -62,7 +63,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
62 63
63 public int m_outstandingtextures = 0; 64 public int m_outstandingtextures = 0;
64 //Constructor 65 //Constructor
65 public LLImageManager(LLClientView client, IAssetCache pAssetCache, IJ2KDecoder pJ2kDecodeModule) 66 public LLImageManager(LLClientView client, IAssetService pAssetCache, IJ2KDecoder pJ2kDecodeModule)
66 { 67 {
67 68
68 m_imagestore = new Dictionary<UUID,J2KImage>(); 69 m_imagestore = new Dictionary<UUID,J2KImage>();
@@ -71,7 +72,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
71 m_client = client; 72 m_client = client;
72 m_assetCache = pAssetCache; 73 m_assetCache = pAssetCache;
73 if (pAssetCache != null) 74 if (pAssetCache != null)
74 m_missingsubstitute = pAssetCache.GetAsset(UUID.Parse("5748decc-f629-461c-9a36-a35a221fe21f"), true); 75 m_missingsubstitute = pAssetCache.Get("5748decc-f629-461c-9a36-a35a221fe21f");
75 else 76 else
76 m_log.Error("[ClientView] - couldn't set missing image, all manner of things will probably break"); 77 m_log.Error("[ClientView] - couldn't set missing image, all manner of things will probably break");
77 m_j2kDecodeModule = pJ2kDecodeModule; 78 m_j2kDecodeModule = pJ2kDecodeModule;