From 31a2c07e833cab6ca2f14e493fd1b96e776097c2 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 17 Aug 2014 09:54:38 +0100 Subject: [PATCH] put bake bakes, plus a missing change forcing animations to pass by scenepresence --- .../Framework/EntityTransfer/EntityTransferModule.cs | 2 +- .../Framework/Scenes/Animation/ScenePresenceAnimator.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 687871e108..feeb0d5cd6 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -1681,7 +1681,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer AgentData cAgent = new AgentData(); agent.CopyTo(cAgent); - agent.Appearance.WearableCacheItems = null; +// agent.Appearance.WearableCacheItems = null; cAgent.Position = pos + agent.Velocity; if (isFlying) diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index ecd6a09a9b..668087f6b3 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs @@ -557,6 +557,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation /// public void SendAnimPack(UUID[] animations, int[] seqs, UUID[] objectIDs) { +/* if (m_scenePresence.IsChildAgent) return; @@ -571,6 +572,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation { client.SendAnimations(animations, seqs, m_scenePresence.ControllingClient.AgentId, objectIDs); }); + */ + m_scenePresence.SendAnimPack(animations, seqs, objectIDs); } public void SendAnimPackToClient(IClientAPI client) @@ -602,7 +605,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); - SendAnimPack(animIDs, sequenceNums, objectIDs); +// SendAnimPack(animIDs, sequenceNums, objectIDs); + m_scenePresence.SendAnimPack(animIDs, sequenceNums, objectIDs); } public string GetAnimName(UUID animId)