aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-08-19 12:41:57 -0700
committerDiva Canto2009-08-20 10:32:38 -0700
commitae2ceda479a2b223189b5eecedc46798e1152fcd (patch)
treedcda48a3a59b121203425ff906f757d3a6fd6783
parentOne more place fixed for setting the inventory folder owner. Thanks jhurliman. (diff)
downloadopensim-SC_OLD-ae2ceda479a2b223189b5eecedc46798e1152fcd.zip
opensim-SC_OLD-ae2ceda479a2b223189b5eecedc46798e1152fcd.tar.gz
opensim-SC_OLD-ae2ceda479a2b223189b5eecedc46798e1152fcd.tar.bz2
opensim-SC_OLD-ae2ceda479a2b223189b5eecedc46798e1152fcd.tar.xz
* Only update TextureEntry in AvatarAppearance if the incoming XML-RPC has a valid TextureEntry. About half the time update_avatar_appearance calls are made, the TextureEntry is empty
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 7270f32..1fb01ba 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -503,7 +503,14 @@ namespace OpenSim.Framework
503 Owner = new UUID((string)h["owner"]); 503 Owner = new UUID((string)h["owner"]);
504 Serial = Convert.ToInt32((string)h["serial"]); 504 Serial = Convert.ToInt32((string)h["serial"]);
505 VisualParams = (byte[])h["visual_params"]; 505 VisualParams = (byte[])h["visual_params"];
506 Texture = new Primitive.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length); 506
507 if (h.Contains("texture"))
508 {
509 byte[] te = h["texture"] as byte[];
510 if (te != null && te.Length > 0)
511 Texture = new Primitive.TextureEntry(te, 0, te.Length);
512 }
513
507 AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); 514 AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]);
508 515
509 m_wearables = new AvatarWearable[MAX_WEARABLES]; 516 m_wearables = new AvatarWearable[MAX_WEARABLES];