diff options
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/CoreModules')
-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 | //{ |