aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie Thielker2015-11-01 19:11:14 +0100
committerMelanie Thielker2015-11-01 19:11:14 +0100
commit69585a4824a7814bbe543d624de6c3627e0b927b (patch)
tree5d4bb6480906000f019c0d456939b24f5dfd8ab4 /OpenSim/Region/ClientStack
parentMerge branch 'master' into avinationmerge (diff)
downloadopensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.zip
opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.gz
opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.bz2
opensim-SC_OLD-69585a4824a7814bbe543d624de6c3627e0b927b.tar.xz
More plumbing of the EntityTransferContext (not yet complete)
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 51c59e9..e20ab50 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12233,10 +12233,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12233 cachedresp.WearableData = 12233 cachedresp.WearableData =
12234 new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length]; 12234 new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
12235 12235
12236 int maxWearablesLoop = cachedtex.WearableData.Length;
12237 if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
12238 maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
12239
12240 int cacheHits = 0; 12236 int cacheHits = 0;
12241 12237
12242 // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid 12238 // We need to make sure the asset stored in the bake is available on this server also by it's assetid before we map it to a Cacheid
@@ -12250,6 +12246,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12250 cacheItems = p.Appearance.WearableCacheItems; 12246 cacheItems = p.Appearance.WearableCacheItems;
12251 } 12247 }
12252 12248
12249 int maxWearablesLoop = cachedtex.WearableData.Length;
12250 if (maxWearablesLoop > cacheItems.Length)
12251 maxWearablesLoop = cacheItems.Length;
12252
12253 if (cacheItems != null) 12253 if (cacheItems != null)
12254 { 12254 {
12255 for (int i = 0; i < maxWearablesLoop; i++) 12255 for (int i = 0; i < maxWearablesLoop; i++)