diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index c250787..739e202 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -6409,26 +6409,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6409 | // Temporarily protect ourselves from the mantis #951 failure. | 6409 | // Temporarily protect ourselves from the mantis #951 failure. |
6410 | // However, we could do this for several other handlers where a failure isn't terminal | 6410 | // However, we could do this for several other handlers where a failure isn't terminal |
6411 | // for the client session anyway, in order to protect ourselves against bad code in plugins | 6411 | // for the client session anyway, in order to protect ourselves against bad code in plugins |
6412 | Vector3 avSize = appear.AgentData.Size; | ||
6412 | try | 6413 | try |
6413 | { | 6414 | { |
6414 | byte[] visualparams = new byte[appear.VisualParam.Length]; | 6415 | byte[] visualparams = new byte[appear.VisualParam.Length]; |
6415 | for (int i = 0; i < appear.VisualParam.Length; i++) | 6416 | for (int i = 0; i < appear.VisualParam.Length; i++) |
6416 | visualparams[i] = appear.VisualParam[i].ParamValue; | 6417 | visualparams[i] = appear.VisualParam[i].ParamValue; |
6418 | //var b = appear.WearableData[0]; | ||
6417 | 6419 | ||
6418 | Primitive.TextureEntry te = null; | 6420 | Primitive.TextureEntry te = null; |
6419 | if (appear.ObjectData.TextureEntry.Length > 1) | 6421 | if (appear.ObjectData.TextureEntry.Length > 1) |
6420 | te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length); | 6422 | te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length); |
6421 | 6423 | ||
6422 | List<CachedTextureRequestArg> hashes = new List<CachedTextureRequestArg>(); | 6424 | WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length]; |
6423 | for (int i = 0; i < appear.WearableData.Length; i++) | 6425 | for (int i=0; i<appear.WearableData.Length;i++) |
6424 | { | 6426 | cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)}; |
6425 | CachedTextureRequestArg arg = new CachedTextureRequestArg(); | 6427 | |
6426 | arg.BakedTextureIndex = appear.WearableData[i].TextureIndex; | 6428 | |
6427 | arg.WearableHashID = appear.WearableData[i].CacheID; | ||
6428 | hashes.Add(arg); | ||
6429 | } | ||
6430 | 6429 | ||
6431 | handlerSetAppearance(sender, te, visualparams, hashes); | 6430 | handlerSetAppearance(sender, te, visualparams,avSize, cacheitems); |
6432 | } | 6431 | } |
6433 | catch (Exception e) | 6432 | catch (Exception e) |
6434 | { | 6433 | { |