From c381bee515de5a4cc4608f4eef308505a40fd7e4 Mon Sep 17 00:00:00 2001 From: diva Date: Tue, 17 Feb 2009 23:46:19 +0000 Subject: Makes SP.CopyFrom a bit more robust with respect to sims in older versions which still don't have the new appearance management code. --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a488f59..fed541f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2678,10 +2678,10 @@ namespace OpenSim.Region.Framework.Scenes m_setAlwaysRun = cAgent.AlwaysRun; uint i = 0; - AvatarWearable[] wearables = new AvatarWearable[cAgent.AgentTextures.Length / 2]; - Primitive.TextureEntry te = new Primitive.TextureEntry(UUID.Random()); try { + AvatarWearable[] wearables = new AvatarWearable[cAgent.AgentTextures.Length / 2]; + Primitive.TextureEntry te = new Primitive.TextureEntry(UUID.Random()); for (uint n = 0; n < cAgent.AgentTextures.Length; n += 2) { UUID itemId = cAgent.AgentTextures[n]; @@ -2689,15 +2689,13 @@ namespace OpenSim.Region.Framework.Scenes wearables[i] = new AvatarWearable(itemId, assetId); te.CreateFace(i++).TextureID = assetId; } + m_appearance.Wearables = wearables; + m_appearance.SetAppearance(te.ToBytes(), new List(cAgent.VisualParams)); } catch (Exception e) { m_log.Warn("[SCENE PRESENCE]: exception in CopyFrom " + e.Message); } - //m_appearance.Texture = te; - m_appearance.Wearables = wearables; - //m_appearance.VisualParams = cAgent.VisualParams; - m_appearance.SetAppearance(te.ToBytes(), new List(cAgent.VisualParams)); //cAgent.GroupID = ?? //Groups??? -- cgit v1.1