OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

slimupdates
Diva Canto 2010-01-12 09:49:27 -08:00
parent 66920a9047
commit 011a1b3798
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2683,6 +2683,8 @@ namespace OpenSim.Region.Framework.Scenes
//CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); //CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
ScenePresence sp = CreateAndAddScenePresence(client); ScenePresence sp = CreateAndAddScenePresence(client);
sp.Appearance = aCircuit.Appearance;
// HERE!!! Do the initial attachments right here // HERE!!! Do the initial attachments right here
// first agent upon login is a root agent by design. // first agent upon login is a root agent by design.
// All other AddNewClient calls find aCircuit.child to be true // All other AddNewClient calls find aCircuit.child to be true

4
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@ -423,6 +423,7 @@ namespace OpenSim.Region.Framework.Scenes
agent.InventoryFolder = UUID.Zero; agent.InventoryFolder = UUID.Zero;
agent.startpos = new Vector3(128, 128, 70); agent.startpos = new Vector3(128, 128, 70);
agent.child = true; agent.child = true;
agent.Appearance = avatar.Appearance;
if (newRegions.Contains(neighbour.RegionHandle)) if (newRegions.Contains(neighbour.RegionHandle))
{ {
@ -515,6 +516,9 @@ namespace OpenSim.Region.Framework.Scenes
agent.InventoryFolder = UUID.Zero; agent.InventoryFolder = UUID.Zero;
agent.startpos = new Vector3(128, 128, 70); agent.startpos = new Vector3(128, 128, 70);
agent.child = true; agent.child = true;
if (avatar.Appearance == null)
m_log.Debug("XXX Appearance is null!!!!");
agent.Appearance = avatar.Appearance;
InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
d.BeginInvoke(avatar, agent, region, region.ExternalEndPoint, true, d.BeginInvoke(avatar, agent, region, region.ExternalEndPoint, true,