From ca43a7fe63f8c2582c59419ce29687609e5e4257 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 19 Aug 2014 09:42:45 +0100 Subject: [PATCH] variationsss... --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4f768bb5ca..8c3f5162f3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -1912,7 +1912,6 @@ namespace OpenSim.Region.Framework.Scenes return; sog.SendFullUpdateToClient(p.ControllingClient); SendFullUpdateToClient(p.ControllingClient); // resend our data by updates path - SendTerseUpdateToAgent(p); }); sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); @@ -3657,6 +3656,11 @@ namespace OpenSim.Region.Framework.Scenes avatar.ControllingClient.SendAvatarDataImmediate(this); } + public void SendAvatarDataToAgentNF(ScenePresence avatar) + { + avatar.ControllingClient.SendAvatarDataImmediate(this); + } + /// /// Send this agent's appearance to all other root and child agents in the scene /// This agent must be root. @@ -5513,7 +5517,7 @@ namespace OpenSim.Region.Framework.Scenes if (p.IsChildAgent) continue; - p.SendUpdateToAgent(this); + p.SendAvatarDataToAgentNF(this); p.SendAppearanceToAgent(this); if (p.Animator != null) p.Animator.SendAnimPackToClient(ControllingClient); @@ -5828,7 +5832,7 @@ namespace OpenSim.Region.Framework.Scenes { foreach (ScenePresence p in viewsToSendto) { - SendUpdateToAgent(p); + SendAvatarDataToAgentNF(p); SendAppearanceToAgent(p); if (Animator != null) Animator.SendAnimPackToClient(p.ControllingClient); @@ -5844,7 +5848,7 @@ namespace OpenSim.Region.Framework.Scenes continue; // m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname); - p.SendUpdateToAgent(this); + p.SendAvatarDataToAgentNF(this); p.SendAppearanceToAgent(this); if (p.Animator != null) p.Animator.SendAnimPackToClient(ControllingClient);