From 011a1b3798016af355ffa352dc93667429749341 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 12 Jan 2010 09:49:27 -0800 Subject: [PATCH] More appearance woes fixed, this time for child agents. Tested on a grid with 2 simulators. Everything seems to be working, including border crosses. TPs (prim crossing) need love now. --- OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++ OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6c8068ccf1..4bbea161d7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -2683,6 +2683,8 @@ namespace OpenSim.Region.Framework.Scenes //CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); ScenePresence sp = CreateAndAddScenePresence(client); + sp.Appearance = aCircuit.Appearance; + // HERE!!! Do the initial attachments right here // first agent upon login is a root agent by design. // All other AddNewClient calls find aCircuit.child to be true diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 11cb8cd762..1e7f54aa1e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -423,6 +423,7 @@ namespace OpenSim.Region.Framework.Scenes agent.InventoryFolder = UUID.Zero; agent.startpos = new Vector3(128, 128, 70); agent.child = true; + agent.Appearance = avatar.Appearance; if (newRegions.Contains(neighbour.RegionHandle)) { @@ -515,6 +516,9 @@ namespace OpenSim.Region.Framework.Scenes agent.InventoryFolder = UUID.Zero; agent.startpos = new Vector3(128, 128, 70); agent.child = true; + if (avatar.Appearance == null) + m_log.Debug("XXX Appearance is null!!!!"); + agent.Appearance = avatar.Appearance; InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; d.BeginInvoke(avatar, agent, region, region.ExternalEndPoint, true,