aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2008-07-23 14:26:30 +0000
committerMW2008-07-23 14:26:30 +0000
commitecd296ad6737b2770f2f556c2fec6cfecc1851f8 (patch)
tree27602e5c5cd15f5293a27d56349e62c6f89bcf57 /OpenSim
parentFix a race causing a buffer overflow under moderate load (diff)
downloadopensim-SC_OLD-ecd296ad6737b2770f2f556c2fec6cfecc1851f8.zip
opensim-SC_OLD-ecd296ad6737b2770f2f556c2fec6cfecc1851f8.tar.gz
opensim-SC_OLD-ecd296ad6737b2770f2f556c2fec6cfecc1851f8.tar.bz2
opensim-SC_OLD-ecd296ad6737b2770f2f556c2fec6cfecc1851f8.tar.xz
Send Animation data for other avatars to new users joining the region (tested on new logins, but need to test that it is triggered on teleports).
This should fix the sitting avatars appearing in a T pose to new users. And possible other animation problems.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs13
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 2bbdac1..57b717c 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1645,6 +1645,7 @@ namespace OpenSim.Region.Environment.Scenes
1645 { 1645 {
1646 avatar.SendFullUpdateToOtherClient(this); 1646 avatar.SendFullUpdateToOtherClient(this);
1647 avatar.SendAppearanceToOtherAgent(this); 1647 avatar.SendAppearanceToOtherAgent(this);
1648 avatar.SendAnimPackToClient(this.ControllingClient);
1648 } 1649 }
1649 } 1650 }
1650 } 1651 }
@@ -1773,6 +1774,18 @@ namespace OpenSim.Region.Environment.Scenes
1773 delegate(IClientAPI client) { client.SendAnimations(animations, seqs, m_controllingClient.AgentId); }); 1774 delegate(IClientAPI client) { client.SendAnimations(animations, seqs, m_controllingClient.AgentId); });
1774 } 1775 }
1775 1776
1777 public void SendAnimPackToClient(IClientAPI client)
1778 {
1779 if (m_isChildAgent)
1780 return;
1781 LLUUID[] animIDs;
1782 int[] sequenceNums;
1783
1784 m_animations.GetArrays(out animIDs, out sequenceNums);
1785
1786 client.SendAnimations(animIDs, sequenceNums, m_controllingClient.AgentId);
1787 }
1788
1776 /// <summary> 1789 /// <summary>
1777 /// 1790 ///
1778 /// </summary> 1791 /// </summary>