aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorubit2012-12-07 22:28:48 +0100
committerubit2012-12-07 22:28:48 +0100
commitfc33b7e9ebd19ba63710882e559702e5d171ab96 (patch)
tree2a5d82166572668a0cc1b0d9c3a02cb3a9e48cea /OpenSim/Region/ClientStack/Linden/UDP
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentrevert the use of avatar skeleton and use avatar size provided by viewers, (diff)
downloadopensim-SC-fc33b7e9ebd19ba63710882e559702e5d171ab96.zip
opensim-SC-fc33b7e9ebd19ba63710882e559702e5d171ab96.tar.gz
opensim-SC-fc33b7e9ebd19ba63710882e559702e5d171ab96.tar.bz2
opensim-SC-fc33b7e9ebd19ba63710882e559702e5d171ab96.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8e0b72f..2efaa79 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -6248,6 +6248,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6248 // Temporarily protect ourselves from the mantis #951 failure. 6248 // Temporarily protect ourselves from the mantis #951 failure.
6249 // However, we could do this for several other handlers where a failure isn't terminal 6249 // However, we could do this for several other handlers where a failure isn't terminal
6250 // for the client session anyway, in order to protect ourselves against bad code in plugins 6250 // for the client session anyway, in order to protect ourselves against bad code in plugins
6251 Vector3 avSize = appear.AgentData.Size;
6251 try 6252 try
6252 { 6253 {
6253 byte[] visualparams = new byte[appear.VisualParam.Length]; 6254 byte[] visualparams = new byte[appear.VisualParam.Length];
@@ -6258,7 +6259,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6258 if (appear.ObjectData.TextureEntry.Length > 1) 6259 if (appear.ObjectData.TextureEntry.Length > 1)
6259 te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length); 6260 te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
6260 6261
6261 handlerSetAppearance(sender, te, visualparams); 6262 handlerSetAppearance(sender, te, visualparams,avSize);
6262 } 6263 }
6263 catch (Exception e) 6264 catch (Exception e)
6264 { 6265 {