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/Region/CoreModules/Avatar/AvatarFactory | |
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/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 3080023..27cf204 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -205,10 +205,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
205 | // ((ScenePresence)sp).SetSize(box,off); | 205 | // ((ScenePresence)sp).SetSize(box,off); |
206 | 206 | ||
207 | } | 207 | } |
208 | //if (cacheItems.Length > 0) | 208 | |
209 | //{ | ||
210 | sp.Appearance.WearableCacheItems = cacheItems; | ||
211 | //} | ||
212 | // Process the baked texture array | 209 | // Process the baked texture array |
213 | if (textureEntry != null) | 210 | if (textureEntry != null) |
214 | { | 211 | { |
@@ -284,8 +281,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
284 | public WearableCacheItem[] GetCachedItems(UUID agentId) | 281 | public WearableCacheItem[] GetCachedItems(UUID agentId) |
285 | { | 282 | { |
286 | ScenePresence sp = m_scene.GetScenePresence(agentId); | 283 | ScenePresence sp = m_scene.GetScenePresence(agentId); |
287 | Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = GetBakedTextureFaces(sp); | ||
288 | |||
289 | WearableCacheItem[] items = sp.Appearance.WearableCacheItems; | 284 | WearableCacheItem[] items = sp.Appearance.WearableCacheItems; |
290 | //foreach (WearableCacheItem item in items) | 285 | //foreach (WearableCacheItem item in items) |
291 | //{ | 286 | //{ |