diff options
author | Diva Canto | 2010-01-13 09:17:30 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-13 09:17:30 -0800 |
commit | 7356860b487febd12c2e0de2f009a6df9ea0aeec (patch) | |
tree | 801eaa0c90483cca8a07f2b4f9f30bf16be84f62 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
parent | More appearance woes fixed, this time for child agents. Tested on a grid with... (diff) | |
download | opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.zip opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.gz opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.bz2 opensim-SC_OLD-7356860b487febd12c2e0de2f009a6df9ea0aeec.tar.xz |
Several more buglets removed.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 1e7f54a..63719ac 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -414,7 +414,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
414 | /// Create the necessary child agents | 414 | /// Create the necessary child agents |
415 | List<AgentCircuitData> cagents = new List<AgentCircuitData>(); | 415 | List<AgentCircuitData> cagents = new List<AgentCircuitData>(); |
416 | foreach (GridRegion neighbour in neighbours) | 416 | foreach (GridRegion neighbour in neighbours) |
417 | { | 417 | { |
418 | if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle) | 418 | if (neighbour.RegionHandle != avatar.Scene.RegionInfo.RegionHandle) |
419 | { | 419 | { |
420 | 420 | ||
@@ -446,7 +446,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
446 | 446 | ||
447 | if (avatar.Scene.CapsModule != null) | 447 | if (avatar.Scene.CapsModule != null) |
448 | { | 448 | { |
449 | // These two are the same thing! | ||
450 | avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds); | 449 | avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds); |
451 | } | 450 | } |
452 | avatar.KnownRegions = seeds; | 451 | avatar.KnownRegions = seeds; |
@@ -516,8 +515,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
516 | agent.InventoryFolder = UUID.Zero; | 515 | agent.InventoryFolder = UUID.Zero; |
517 | agent.startpos = new Vector3(128, 128, 70); | 516 | agent.startpos = new Vector3(128, 128, 70); |
518 | agent.child = true; | 517 | agent.child = true; |
519 | if (avatar.Appearance == null) | ||
520 | m_log.Debug("XXX Appearance is null!!!!"); | ||
521 | agent.Appearance = avatar.Appearance; | 518 | agent.Appearance = avatar.Appearance; |
522 | 519 | ||
523 | InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; | 520 | InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; |
@@ -1450,17 +1447,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
1450 | return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); | 1447 | return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); |
1451 | } | 1448 | } |
1452 | 1449 | ||
1453 | //private void Dump(string msg, List<ulong> handles) | 1450 | private void Dump(string msg, List<ulong> handles) |
1454 | //{ | 1451 | { |
1455 | // m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); | 1452 | m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg); |
1456 | // foreach (ulong handle in handles) | 1453 | foreach (ulong handle in handles) |
1457 | // { | 1454 | { |
1458 | // uint x, y; | 1455 | uint x, y; |
1459 | // Utils.LongToUInts(handle, out x, out y); | 1456 | Utils.LongToUInts(handle, out x, out y); |
1460 | // x = x / Constants.RegionSize; | 1457 | x = x / Constants.RegionSize; |
1461 | // y = y / Constants.RegionSize; | 1458 | y = y / Constants.RegionSize; |
1462 | // m_log.InfoFormat("({0}, {1})", x, y); | 1459 | m_log.InfoFormat("({0}, {1})", x, y); |
1463 | // } | 1460 | } |
1464 | //} | 1461 | } |
1465 | } | 1462 | } |
1466 | } | 1463 | } |