diff options
author | Justin Clarke Casey | 2008-10-29 18:38:10 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-29 18:38:10 +0000 |
commit | 8a3157aa6a83b7b84811cd4675ba9fc8e6fbd32e (patch) | |
tree | 76fe871eb5c1f1602fd7df1ec2cdeb89602ecb51 /OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |
parent | Viewer side normals and UV fixes on profile cuts. Sync with primmesher.dll fo... (diff) | |
download | opensim-SC_OLD-8a3157aa6a83b7b84811cd4675ba9fc8e6fbd32e.zip opensim-SC_OLD-8a3157aa6a83b7b84811cd4675ba9fc8e6fbd32e.tar.gz opensim-SC_OLD-8a3157aa6a83b7b84811cd4675ba9fc8e6fbd32e.tar.bz2 opensim-SC_OLD-8a3157aa6a83b7b84811cd4675ba9fc8e6fbd32e.tar.xz |
* Check in (disabled) results of not persisting avatar textures but rather sending ImageNotFound to clients if avatar textures are missing
* Whilst this does automatically get the client to rebake, on crossing a region border the 'local' assets are left behind
* There may be a cunning solution (such as squirting the assets on region crossing, or having them fetched from the original region) but
instead I'm going to opt for the easy solution of keeping them in the asset database, for now
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs index 93f4d1b..715dc4b 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -121,10 +121,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
121 | } | 121 | } |
122 | else | 122 | else |
123 | { | 123 | { |
124 | // m_log.DebugFormat("[TEXTURE]: Received a request for texture {0}", e.RequestedAssetID); | ||
125 | |||
124 | if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) | 126 | if (!foundTextureLimitStrategy.AllowRequest(e.RequestedAssetID)) |
125 | { | 127 | { |
126 | // m_log.DebugFormat( | 128 | // m_log.DebugFormat( |
127 | // "[USER TEXTURE DOWNLOAD SERVICE]: Refusing request for {0} from client {1}", | 129 | // "[TEXTURE]: Refusing request for {0} from client {1}", |
128 | // e.RequestedAssetID, m_client.AgentId); | 130 | // e.RequestedAssetID, m_client.AgentId); |
129 | 131 | ||
130 | return; | 132 | return; |
@@ -139,7 +141,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
139 | // Commenting out this message for now as it causes too much noise with other | 141 | // Commenting out this message for now as it causes too much noise with other |
140 | // debug messages. | 142 | // debug messages. |
141 | // m_log.DebugFormat( | 143 | // m_log.DebugFormat( |
142 | // "[USER TEXTURE DOWNLOAD SERVICE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", | 144 | // "[TEXTURE]: Dropping requests for notified missing texture {0} for client {1} since we have received more than {2} requests", |
143 | // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); | 145 | // e.RequestedAssetID, m_client.AgentId, MAX_ALLOWED_TEXTURE_REQUESTS); |
144 | } | 146 | } |
145 | 147 | ||
@@ -196,7 +198,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
196 | missingTextureLimitStrategy.MonitorRequests(textureID); | 198 | missingTextureLimitStrategy.MonitorRequests(textureID); |
197 | 199 | ||
198 | // m_log.DebugFormat( | 200 | // m_log.DebugFormat( |
199 | // "[USER TEXTURE DOWNLOAD SERVICE]: Queueing first TextureNotFoundSender for {0}, client {1}", | 201 | // "[TEXTURE]: Queueing first TextureNotFoundSender for {0}, client {1}", |
200 | // textureID, m_client.AgentId); | 202 | // textureID, m_client.AgentId); |
201 | } | 203 | } |
202 | 204 | ||
@@ -214,14 +216,14 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
214 | } | 216 | } |
215 | } | 217 | } |
216 | 218 | ||
217 | //m_log.InfoFormat("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID); | 219 | //m_log.InfoFormat("[TEXTURE] Removing texture sender with uuid {0}", textureID); |
218 | m_textureSenders.Remove(textureID); | 220 | m_textureSenders.Remove(textureID); |
219 | //m_log.InfoFormat("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count); | 221 | //m_log.InfoFormat("[TEXTURE] Current texture senders in dictionary: {0}", m_textureSenders.Count); |
220 | } | 222 | } |
221 | else | 223 | else |
222 | { | 224 | { |
223 | m_log.WarnFormat( | 225 | m_log.WarnFormat( |
224 | "[USER TEXTURE DOWNLOAD SERVICE]: Got a texture uuid {0} with no sender object to handle it, this shouldn't happen", | 226 | "[TEXTURE]: Got a texture uuid {0} with no sender object to handle it, this shouldn't happen", |
225 | textureID); | 227 | textureID); |
226 | } | 228 | } |
227 | } | 229 | } |