aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2014-08-19 09:42:45 +0100
committerUbitUmarov2014-08-19 09:42:45 +0100
commitca43a7fe63f8c2582c59419ce29687609e5e4257 (patch)
treec2b72410be945f900abd3212e5a8f1ddf6046948 /OpenSim/Region
parent remove the silly sendTerseUpdates. I was fooled by wingridproxy not (diff)
downloadopensim-SC_OLD-ca43a7fe63f8c2582c59419ce29687609e5e4257.zip
opensim-SC_OLD-ca43a7fe63f8c2582c59419ce29687609e5e4257.tar.gz
opensim-SC_OLD-ca43a7fe63f8c2582c59419ce29687609e5e4257.tar.bz2
opensim-SC_OLD-ca43a7fe63f8c2582c59419ce29687609e5e4257.tar.xz
variationsss...
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 4f768bb..8c3f516 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1912,7 +1912,6 @@ namespace OpenSim.Region.Framework.Scenes
1912 return; 1912 return;
1913 sog.SendFullUpdateToClient(p.ControllingClient); 1913 sog.SendFullUpdateToClient(p.ControllingClient);
1914 SendFullUpdateToClient(p.ControllingClient); // resend our data by updates path 1914 SendFullUpdateToClient(p.ControllingClient); // resend our data by updates path
1915 SendTerseUpdateToAgent(p);
1916 }); 1915 });
1917 1916
1918 sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource()); 1917 sog.RootPart.ParentGroup.CreateScriptInstances(0, false, m_scene.DefaultScriptEngine, GetStateSource());
@@ -3657,6 +3656,11 @@ namespace OpenSim.Region.Framework.Scenes
3657 avatar.ControllingClient.SendAvatarDataImmediate(this); 3656 avatar.ControllingClient.SendAvatarDataImmediate(this);
3658 } 3657 }
3659 3658
3659 public void SendAvatarDataToAgentNF(ScenePresence avatar)
3660 {
3661 avatar.ControllingClient.SendAvatarDataImmediate(this);
3662 }
3663
3660 /// <summary> 3664 /// <summary>
3661 /// Send this agent's appearance to all other root and child agents in the scene 3665 /// Send this agent's appearance to all other root and child agents in the scene
3662 /// This agent must be root. 3666 /// This agent must be root.
@@ -5513,7 +5517,7 @@ namespace OpenSim.Region.Framework.Scenes
5513 if (p.IsChildAgent) 5517 if (p.IsChildAgent)
5514 continue; 5518 continue;
5515 5519
5516 p.SendUpdateToAgent(this); 5520 p.SendAvatarDataToAgentNF(this);
5517 p.SendAppearanceToAgent(this); 5521 p.SendAppearanceToAgent(this);
5518 if (p.Animator != null) 5522 if (p.Animator != null)
5519 p.Animator.SendAnimPackToClient(ControllingClient); 5523 p.Animator.SendAnimPackToClient(ControllingClient);
@@ -5828,7 +5832,7 @@ namespace OpenSim.Region.Framework.Scenes
5828 { 5832 {
5829 foreach (ScenePresence p in viewsToSendto) 5833 foreach (ScenePresence p in viewsToSendto)
5830 { 5834 {
5831 SendUpdateToAgent(p); 5835 SendAvatarDataToAgentNF(p);
5832 SendAppearanceToAgent(p); 5836 SendAppearanceToAgent(p);
5833 if (Animator != null) 5837 if (Animator != null)
5834 Animator.SendAnimPackToClient(p.ControllingClient); 5838 Animator.SendAnimPackToClient(p.ControllingClient);
@@ -5844,7 +5848,7 @@ namespace OpenSim.Region.Framework.Scenes
5844 continue; 5848 continue;
5845// m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname); 5849// m_log.Debug("[AVATAR]: viewMe: " + Lastname + "<-" + p.Lastname);
5846 5850
5847 p.SendUpdateToAgent(this); 5851 p.SendAvatarDataToAgentNF(this);
5848 p.SendAppearanceToAgent(this); 5852 p.SendAppearanceToAgent(this);
5849 if (p.Animator != null) 5853 if (p.Animator != null)
5850 p.Animator.SendAnimPackToClient(ControllingClient); 5854 p.Animator.SendAnimPackToClient(ControllingClient);