OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

variationsss...

avinationmerge
UbitUmarov 2014-08-19 09:42:45 +01:00
parent b0253362c7
commit ca43a7fe63
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1912,7 +1912,6 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
sog.SendFullUpdateToClient(p.ControllingClient); sog.SendFullUpdateToClient(p.ControllingClient);
SendFullUpdateToClient(p.ControllingClient); // resend our data by updates path SendFullUpdateToClient(p.ControllingClient); // resend our data by updates path
SendTerseUpdateToAgent(p);
}); });
sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
@ -3657,6 +3656,11 @@ namespace OpenSim.Region.Framework.Scenes
avatar.ControllingClient.SendAvatarDataImmediate(this); avatar.ControllingClient.SendAvatarDataImmediate(this);
} }
public void SendAvatarDataToAgentNF(ScenePresence avatar)
{
avatar.ControllingClient.SendAvatarDataImmediate(this);
}
/// <summary> /// <summary>
/// Send this agent's appearance to all other root and child agents in the scene /// Send this agent's appearance to all other root and child agents in the scene
/// This agent must be root. /// This agent must be root.
@ -5513,7 +5517,7 @@ namespace OpenSim.Region.Framework.Scenes
if (p.IsChildAgent) if (p.IsChildAgent)
continue; continue;
p.SendUpdateToAgent(this); p.SendAvatarDataToAgentNF(this);
p.SendAppearanceToAgent(this); p.SendAppearanceToAgent(this);
if (p.Animator != null) if (p.Animator != null)
p.Animator.SendAnimPackToClient(ControllingClient); p.Animator.SendAnimPackToClient(ControllingClient);
@ -5828,7 +5832,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
foreach (ScenePresence p in viewsToSendto) foreach (ScenePresence p in viewsToSendto)
{ {
SendUpdateToAgent(p); SendAvatarDataToAgentNF(p);
SendAppearanceToAgent(p); SendAppearanceToAgent(p);
if (Animator != null) if (Animator != null)
Animator.SendAnimPackToClient(p.ControllingClient); Animator.SendAnimPackToClient(p.ControllingClient);
@ -5844,7 +5848,7 @@ namespace OpenSim.Region.Framework.Scenes
continue; continue;
// m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname); // m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
p.SendUpdateToAgent(this); p.SendAvatarDataToAgentNF(this);
p.SendAppearanceToAgent(this); p.SendAppearanceToAgent(this);
if (p.Animator != null) if (p.Animator != null)
p.Animator.SendAnimPackToClient(ControllingClient); p.Animator.SendAnimPackToClient(ControllingClient);