change avatars sending point

0.9.1.0-post-fixes
UbitUmarov 2019-04-02 20:27:56 +01:00
parent b458c5a9b4
commit 8e094887cd
1 changed files with 10 additions and 8 deletions

View File

@ -2193,9 +2193,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
//m_log.DebugFormat("[CompleteMovement] Baked check: {0}ms", Util.EnvironmentTickCountSubtract(ts));
// HG
if(isHGTP) if(isHGTP)
{ {
// ControllingClient.SendNameReply(m_uuid, Firstname, Lastname); // ControllingClient.SendNameReply(m_uuid, Firstname, Lastname);
@ -2244,6 +2241,7 @@ namespace OpenSim.Region.Framework.Scenes
// if not cached we send greys // if not cached we send greys
// uncomented if will wait till avatar does baking // uncomented if will wait till avatar does baking
//if (cachedbaked) //if (cachedbaked)
{ {
foreach (ScenePresence p in allpresences) foreach (ScenePresence p in allpresences)
{ {
@ -2257,7 +2255,7 @@ namespace OpenSim.Region.Framework.Scenes
if (haveAnims) if (haveAnims)
SendAnimPackToAgentNF(p, animIDs, animseqs, animsobjs); SendAnimPackToAgentNF(p, animIDs, animseqs, animsobjs);
} }
} // greys if }
// attachments // attachments
if (IsNPC || IsRealLogin(m_teleportFlags)) if (IsNPC || IsRealLogin(m_teleportFlags))
@ -2305,6 +2303,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if(gotCrossUpdate) if(gotCrossUpdate)
{ {
SendOtherAgentsAvatarFullToMe();
// Create child agents in neighbouring regions // Create child agents in neighbouring regions
IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>(); IEntityTransferModule m_agentTransfer = m_scene.RequestModuleInterface<IEntityTransferModule>();
if (m_agentTransfer != null) if (m_agentTransfer != null)
@ -2318,11 +2318,13 @@ namespace OpenSim.Region.Framework.Scenes
m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel; m_lastChildAgentUpdateGodLevel = GodController.ViwerUIGodLevel;
m_childUpdatesBusy = false; // allow them m_childUpdatesBusy = false; // allow them
} }
// send the rest of the world // send the rest of the world
if (m_teleportFlags > 0 || m_currentParcelHide) //if (m_teleportFlags > 0 || m_currentParcelHide)
//SendInitialDataToMe(); //SendInitialDataToMe();
SendOtherAgentsAvatarFullToMe(); //SendOtherAgentsAvatarFullToMe();
// priority uses avatar position only // priority uses avatar position only
// m_reprioritizationLastPosition = AbsolutePosition; // m_reprioritizationLastPosition = AbsolutePosition;
@ -4064,10 +4066,10 @@ namespace OpenSim.Region.Framework.Scenes
ILandChannel landch = m_scene.LandChannel; ILandChannel landch = m_scene.LandChannel;
if (landch != null) if (landch != null)
landch.sendClientInitialLandInfo(ControllingClient, true); landch.sendClientInitialLandInfo(ControllingClient, true);
SendOtherAgentsAvatarFullToMe();
} }
SendOtherAgentsAvatarFullToMe();
if (m_scene.ObjectsCullingByDistance) if (m_scene.ObjectsCullingByDistance)
{ {
m_reprioritizationBusy = true; m_reprioritizationBusy = true;