diff options
author | UbitUmarov | 2014-08-04 19:57:47 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-04 19:57:47 +0100 |
commit | 05a2feba5d780c57c252891a20071800fd9f2e3e (patch) | |
tree | 690addc627a94a260536c4b8b270e60876634626 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | local chat gods bug fix (diff) | |
download | opensim-SC-05a2feba5d780c57c252891a20071800fd9f2e3e.zip opensim-SC-05a2feba5d780c57c252891a20071800fd9f2e3e.tar.gz opensim-SC-05a2feba5d780c57c252891a20071800fd9f2e3e.tar.bz2 opensim-SC-05a2feba5d780c57c252891a20071800fd9f2e3e.tar.xz |
start sending terrain in scenePresence after well defined avatar. Minor
change on significante AgentUpdate check.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 24a92eb..8088dd3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3473,6 +3473,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3473 | landch.sendClientInitialLandInfo(ControllingClient); | 3473 | landch.sendClientInitialLandInfo(ControllingClient); |
3474 | } | 3474 | } |
3475 | } | 3475 | } |
3476 | m_scene.SendLayerData(ControllingClient); | ||
3476 | SendOtherAgentsAvatarDataToMe(); | 3477 | SendOtherAgentsAvatarDataToMe(); |
3477 | SendOtherAgentsAppearanceToMe(); | 3478 | SendOtherAgentsAppearanceToMe(); |
3478 | 3479 | ||
@@ -5426,7 +5427,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5426 | { | 5427 | { |
5427 | if (p.IsChildAgent) | 5428 | if (p.IsChildAgent) |
5428 | continue; | 5429 | continue; |
5429 | m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname); | 5430 | // m_log.Debug("[AVATAR]: viewMe: " + Lastname + " " + p.Lastname); |
5430 | ControllingClient.SendAvatarDataImmediate(p); | 5431 | ControllingClient.SendAvatarDataImmediate(p); |
5431 | p.SendAppearanceToAgent(this); | 5432 | p.SendAppearanceToAgent(this); |
5432 | p.SendAttachmentsToClient(ControllingClient); | 5433 | p.SendAttachmentsToClient(ControllingClient); |
@@ -5454,7 +5455,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5454 | { | 5455 | { |
5455 | foreach (ScenePresence p in killsToSendme) | 5456 | foreach (ScenePresence p in killsToSendme) |
5456 | { | 5457 | { |
5457 | m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname); | 5458 | // m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname); |
5458 | try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); } | 5459 | try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); } |
5459 | catch (NullReferenceException) { } | 5460 | catch (NullReferenceException) { } |
5460 | } | 5461 | } |
@@ -5499,7 +5500,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5499 | { | 5500 | { |
5500 | foreach (ScenePresence p in killsToSendto) | 5501 | foreach (ScenePresence p in killsToSendto) |
5501 | { | 5502 | { |
5502 | m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname); | 5503 | // m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname); |
5503 | try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); } | 5504 | try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); } |
5504 | catch (NullReferenceException) { } | 5505 | catch (NullReferenceException) { } |
5505 | } | 5506 | } |
@@ -5509,7 +5510,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5509 | { | 5510 | { |
5510 | foreach (ScenePresence p in killsToSendme) | 5511 | foreach (ScenePresence p in killsToSendme) |
5511 | { | 5512 | { |
5512 | m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname); | 5513 | // m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname); |
5513 | try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); } | 5514 | try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); } |
5514 | catch (NullReferenceException) { } | 5515 | catch (NullReferenceException) { } |
5515 | } | 5516 | } |
@@ -5519,7 +5520,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5519 | { | 5520 | { |
5520 | foreach (ScenePresence p in viewsToSendto) | 5521 | foreach (ScenePresence p in viewsToSendto) |
5521 | { | 5522 | { |
5522 | m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname); | 5523 | // m_log.Debug("[AVATAR]: viewTo: " + Lastname + " " + p.Lastname); |
5523 | p.ControllingClient.SendAvatarDataImmediate(this); | 5524 | p.ControllingClient.SendAvatarDataImmediate(this); |
5524 | SendAppearanceToAgent(p); | 5525 | SendAppearanceToAgent(p); |
5525 | SendAttachmentsToClient(p.ControllingClient); | 5526 | SendAttachmentsToClient(p.ControllingClient); |
@@ -5532,9 +5533,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
5532 | { | 5533 | { |
5533 | foreach (ScenePresence p in viewsToSendme) | 5534 | foreach (ScenePresence p in viewsToSendme) |
5534 | { | 5535 | { |
5535 | m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname); | ||
5536 | if (p.IsChildAgent) | 5536 | if (p.IsChildAgent) |
5537 | continue; | 5537 | continue; |
5538 | // m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname); | ||
5538 | ControllingClient.SendAvatarDataImmediate(p); | 5539 | ControllingClient.SendAvatarDataImmediate(p); |
5539 | p.SendAppearanceToAgent(this); | 5540 | p.SendAppearanceToAgent(this); |
5540 | p.SendAttachmentsToClient(ControllingClient); | 5541 | p.SendAttachmentsToClient(ControllingClient); |
@@ -5603,7 +5604,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5603 | { | 5604 | { |
5604 | foreach (ScenePresence p in killsToSendme) | 5605 | foreach (ScenePresence p in killsToSendme) |
5605 | { | 5606 | { |
5606 | m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname); | 5607 | // m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname); |
5607 | try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); } | 5608 | try { ControllingClient.SendKillObject(new List<uint> { p.LocalId }); } |
5608 | catch (NullReferenceException) { } | 5609 | catch (NullReferenceException) { } |
5609 | } | 5610 | } |
@@ -5752,7 +5753,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5752 | { | 5753 | { |
5753 | foreach (ScenePresence p in killsToSendto) | 5754 | foreach (ScenePresence p in killsToSendto) |
5754 | { | 5755 | { |
5755 | m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname); | 5756 | // m_log.Debug("[AVATAR]: killTo: " + Lastname + " " + p.Lastname); |
5756 | try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); } | 5757 | try { p.ControllingClient.SendKillObject(new List<uint> { LocalId }); } |
5757 | catch (NullReferenceException) { } | 5758 | catch (NullReferenceException) { } |
5758 | } | 5759 | } |
@@ -5762,7 +5763,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5762 | { | 5763 | { |
5763 | foreach (ScenePresence p in killsToSendme) | 5764 | foreach (ScenePresence p in killsToSendme) |
5764 | { | 5765 | { |
5765 | m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname); | 5766 | // m_log.Debug("[AVATAR]: killMe: " + Lastname + " " + p.Lastname); |
5766 | try {ControllingClient.SendKillObject(new List<uint> { p.LocalId }); } | 5767 | try {ControllingClient.SendKillObject(new List<uint> { p.LocalId }); } |
5767 | catch (NullReferenceException) { } | 5768 | catch (NullReferenceException) { } |
5768 | } | 5769 | } |