aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-12 09:49:27 -0800
committerDiva Canto2010-01-12 09:49:27 -0800
commit011a1b3798016af355ffa352dc93667429749341 (patch)
treee22f82718a0bd28363e01c00c330b21a0a28d667
parentFixed more appearance woes that showed up using remote connectors. Appearance... (diff)
downloadopensim-SC_OLD-011a1b3798016af355ffa352dc93667429749341.zip
opensim-SC_OLD-011a1b3798016af355ffa352dc93667429749341.tar.gz
opensim-SC_OLD-011a1b3798016af355ffa352dc93667429749341.tar.bz2
opensim-SC_OLD-011a1b3798016af355ffa352dc93667429749341.tar.xz
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.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs4
2 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6c8068c..4bbea16 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2683,6 +2683,8 @@ namespace OpenSim.Region.Framework.Scenes
2683 //CommsManager.UserProfileCacheService.AddNewUser(client.AgentId); 2683 //CommsManager.UserProfileCacheService.AddNewUser(client.AgentId);
2684 2684
2685 ScenePresence sp = CreateAndAddScenePresence(client); 2685 ScenePresence sp = CreateAndAddScenePresence(client);
2686 sp.Appearance = aCircuit.Appearance;
2687
2686 // HERE!!! Do the initial attachments right here 2688 // HERE!!! Do the initial attachments right here
2687 // first agent upon login is a root agent by design. 2689 // first agent upon login is a root agent by design.
2688 // All other AddNewClient calls find aCircuit.child to be true 2690 // 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 11cb8cd..1e7f54a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -423,6 +423,7 @@ namespace OpenSim.Region.Framework.Scenes
423 agent.InventoryFolder = UUID.Zero; 423 agent.InventoryFolder = UUID.Zero;
424 agent.startpos = new Vector3(128, 128, 70); 424 agent.startpos = new Vector3(128, 128, 70);
425 agent.child = true; 425 agent.child = true;
426 agent.Appearance = avatar.Appearance;
426 427
427 if (newRegions.Contains(neighbour.RegionHandle)) 428 if (newRegions.Contains(neighbour.RegionHandle))
428 { 429 {
@@ -515,6 +516,9 @@ namespace OpenSim.Region.Framework.Scenes
515 agent.InventoryFolder = UUID.Zero; 516 agent.InventoryFolder = UUID.Zero;
516 agent.startpos = new Vector3(128, 128, 70); 517 agent.startpos = new Vector3(128, 128, 70);
517 agent.child = true; 518 agent.child = true;
519 if (avatar.Appearance == null)
520 m_log.Debug("XXX Appearance is null!!!!");
521 agent.Appearance = avatar.Appearance;
518 522
519 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; 523 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
520 d.BeginInvoke(avatar, agent, region, region.ExternalEndPoint, true, 524 d.BeginInvoke(avatar, agent, region, region.ExternalEndPoint, true,