diff options
author | Melanie | 2013-12-11 01:39:56 +0000 |
---|---|---|
committer | Melanie | 2013-12-11 01:39:56 +0000 |
commit | 5b73b9c4a85335ba837280688b903fef44be8f35 (patch) | |
tree | bd560ec720eb6fbf86b744522b2509071bc31a30 /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.zip opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.gz opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.bz2 opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.xz |
Committing the Avination Scene Presence and related texture code
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
Diffstat (limited to '')
-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 a04ded5..6cb7332 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -6437,26 +6437,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6437 | // Temporarily protect ourselves from the mantis #951 failure. | 6437 | // Temporarily protect ourselves from the mantis #951 failure. |
6438 | // However, we could do this for several other handlers where a failure isn't terminal | 6438 | // However, we could do this for several other handlers where a failure isn't terminal |
6439 | // for the client session anyway, in order to protect ourselves against bad code in plugins | 6439 | // for the client session anyway, in order to protect ourselves against bad code in plugins |
6440 | Vector3 avSize = appear.AgentData.Size; | ||
6440 | try | 6441 | try |
6441 | { | 6442 | { |
6442 | byte[] visualparams = new byte[appear.VisualParam.Length]; | 6443 | byte[] visualparams = new byte[appear.VisualParam.Length]; |
6443 | for (int i = 0; i < appear.VisualParam.Length; i++) | 6444 | for (int i = 0; i < appear.VisualParam.Length; i++) |
6444 | visualparams[i] = appear.VisualParam[i].ParamValue; | 6445 | visualparams[i] = appear.VisualParam[i].ParamValue; |
6446 | //var b = appear.WearableData[0]; | ||
6445 | 6447 | ||
6446 | Primitive.TextureEntry te = null; | 6448 | Primitive.TextureEntry te = null; |
6447 | if (appear.ObjectData.TextureEntry.Length > 1) | 6449 | if (appear.ObjectData.TextureEntry.Length > 1) |
6448 | te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length); | 6450 | te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length); |
6449 | 6451 | ||
6450 | List<CachedTextureRequestArg> hashes = new List<CachedTextureRequestArg>(); | 6452 | WearableCacheItem[] cacheitems = new WearableCacheItem[appear.WearableData.Length]; |
6451 | for (int i = 0; i < appear.WearableData.Length; i++) | 6453 | for (int i=0; i<appear.WearableData.Length;i++) |
6452 | { | 6454 | cacheitems[i] = new WearableCacheItem(){CacheId = appear.WearableData[i].CacheID,TextureIndex=Convert.ToUInt32(appear.WearableData[i].TextureIndex)}; |
6453 | CachedTextureRequestArg arg = new CachedTextureRequestArg(); | 6455 | |
6454 | arg.BakedTextureIndex = appear.WearableData[i].TextureIndex; | 6456 | |
6455 | arg.WearableHashID = appear.WearableData[i].CacheID; | ||
6456 | hashes.Add(arg); | ||
6457 | } | ||
6458 | 6457 | ||
6459 | handlerSetAppearance(sender, te, visualparams, hashes); | 6458 | handlerSetAppearance(sender, te, visualparams,avSize, cacheitems); |
6460 | } | 6459 | } |
6461 | catch (Exception e) | 6460 | catch (Exception e) |
6462 | { | 6461 | { |