diff options
author | teravus | 2012-12-29 08:53:58 -0500 |
---|---|---|
committer | teravus | 2012-12-29 08:53:58 -0500 |
commit | 6797ac14741851efa5ba60a00891e18cf7755c80 (patch) | |
tree | b2b9b4870100f12d59d3bcd257349051fdede2d4 /OpenSim/Capabilities/Handlers/UploadBakedTexture | |
parent | bug fix, cleanup... (diff) | |
download | opensim-SC_OLD-6797ac14741851efa5ba60a00891e18cf7755c80.zip opensim-SC_OLD-6797ac14741851efa5ba60a00891e18cf7755c80.tar.gz opensim-SC_OLD-6797ac14741851efa5ba60a00891e18cf7755c80.tar.bz2 opensim-SC_OLD-6797ac14741851efa5ba60a00891e18cf7755c80.tar.xz |
* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
Diffstat (limited to 'OpenSim/Capabilities/Handlers/UploadBakedTexture')
-rw-r--r-- | OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs index 4fa604f..5536564 100644 --- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs +++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
30 | using System.Collections.Specialized; | 31 | using System.Collections.Specialized; |
31 | using System.Drawing; | 32 | using System.Drawing; |
32 | using System.Drawing.Imaging; | 33 | using System.Drawing.Imaging; |
@@ -50,6 +51,7 @@ namespace OpenSim.Capabilities.Handlers | |||
50 | { | 51 | { |
51 | public class UploadBakedTextureHandler | 52 | public class UploadBakedTextureHandler |
52 | { | 53 | { |
54 | |||
53 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 55 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
54 | 56 | ||
55 | private Caps m_HostCapsObj; | 57 | private Caps m_HostCapsObj; |
@@ -79,9 +81,9 @@ namespace OpenSim.Capabilities.Handlers | |||
79 | { | 81 | { |
80 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; | 82 | string capsBase = "/CAPS/" + m_HostCapsObj.CapsObjectPath; |
81 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); | 83 | string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000"); |
82 | 84 | ||
83 | BakedTextureUploader uploader = | 85 | BakedTextureUploader uploader = |
84 | new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener); | 86 | new BakedTextureUploader(capsBase + uploaderPath, m_HostCapsObj.HttpListener, m_HostCapsObj.AgentID); |
85 | uploader.OnUpLoad += BakedTextureUploaded; | 87 | uploader.OnUpLoad += BakedTextureUploaded; |
86 | 88 | ||
87 | m_HostCapsObj.HttpListener.AddStreamHandler( | 89 | m_HostCapsObj.HttpListener.AddStreamHandler( |
@@ -125,6 +127,7 @@ namespace OpenSim.Capabilities.Handlers | |||
125 | asset.Temporary = true; | 127 | asset.Temporary = true; |
126 | asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are | 128 | asset.Local = !m_persistBakedTextures; // Local assets aren't persisted, non-local are |
127 | m_assetService.Store(asset); | 129 | m_assetService.Store(asset); |
130 | |||
128 | } | 131 | } |
129 | } | 132 | } |
130 | 133 | ||
@@ -137,15 +140,19 @@ namespace OpenSim.Capabilities.Handlers | |||
137 | private string uploaderPath = String.Empty; | 140 | private string uploaderPath = String.Empty; |
138 | private UUID newAssetID; | 141 | private UUID newAssetID; |
139 | private IHttpServer httpListener; | 142 | private IHttpServer httpListener; |
143 | private UUID AgentId = UUID.Zero; | ||
140 | 144 | ||
141 | public BakedTextureUploader(string path, IHttpServer httpServer) | 145 | public BakedTextureUploader(string path, IHttpServer httpServer, UUID uUID) |
142 | { | 146 | { |
143 | newAssetID = UUID.Random(); | 147 | newAssetID = UUID.Random(); |
144 | uploaderPath = path; | 148 | uploaderPath = path; |
145 | httpListener = httpServer; | 149 | httpListener = httpServer; |
150 | AgentId = uUID; | ||
146 | // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); | 151 | // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); |
147 | } | 152 | } |
148 | 153 | ||
154 | |||
155 | |||
149 | /// <summary> | 156 | /// <summary> |
150 | /// Handle raw uploaded baked texture data. | 157 | /// Handle raw uploaded baked texture data. |
151 | /// </summary> | 158 | /// </summary> |