More plumbing of the EntityTransferContext (not yet complete)

This commit is contained in:
Melanie Thielker
2015-11-01 19:11:14 +01:00
parent 29798cefcc
commit 69585a4824
22 changed files with 135 additions and 88 deletions

View File

@@ -12233,10 +12233,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
cachedresp.WearableData =
new AgentCachedTextureResponsePacket.WearableDataBlock[cachedtex.WearableData.Length];
int maxWearablesLoop = cachedtex.WearableData.Length;
if (maxWearablesLoop > AvatarWearable.MAX_WEARABLES)
maxWearablesLoop = AvatarWearable.MAX_WEARABLES;
int cacheHits = 0;
// 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
cacheItems = p.Appearance.WearableCacheItems;
}
int maxWearablesLoop = cachedtex.WearableData.Length;
if (maxWearablesLoop > cacheItems.Length)
maxWearablesLoop = cacheItems.Length;
if (cacheItems != null)
{
for (int i = 0; i < maxWearablesLoop; i++)