aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2013-01-08 13:58:42 +0100
committerMelanie2013-01-08 13:58:42 +0100
commite1cfa846eac0a7d967d118d42cc8c983217a46cc (patch)
treeba97d6d4fc82a1007d14f03b02dd0287a1ad73e0 /OpenSim/Region/CoreModules
parentPrevent avatar data from being sent during login when it's not valid and (diff)
parent also update m_lastSize in SendAvatarDataToAllAgents so more paths update (diff)
downloadopensim-SC_OLD-e1cfa846eac0a7d967d118d42cc8c983217a46cc.zip
opensim-SC_OLD-e1cfa846eac0a7d967d118d42cc8c983217a46cc.tar.gz
opensim-SC_OLD-e1cfa846eac0a7d967d118d42cc8c983217a46cc.tar.bz2
opensim-SC_OLD-e1cfa846eac0a7d967d118d42cc8c983217a46cc.tar.xz
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.cs7
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 //{