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

put bake bakes, plus a missing change forcing animations to pass by 

scenepresence
avinationmerge
UbitUmarov 2014-08-17 09:54:38 +01:00
parent 7ce32d717a
commit 31a2c07e83
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1681,7 +1681,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
AgentData cAgent = new AgentData(); AgentData cAgent = new AgentData();
agent.CopyTo(cAgent); agent.CopyTo(cAgent);
agent.Appearance.WearableCacheItems = null; // agent.Appearance.WearableCacheItems = null;
cAgent.Position = pos + agent.Velocity; cAgent.Position = pos + agent.Velocity;
if (isFlying) if (isFlying)

6
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
View File

@ -557,6 +557,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
/// <param name="objectIDs"></param> /// <param name="objectIDs"></param>
public void SendAnimPack(UUID[] animations, int[] seqs, UUID[] objectIDs) public void SendAnimPack(UUID[] animations, int[] seqs, UUID[] objectIDs)
{ {
/*
if (m_scenePresence.IsChildAgent) if (m_scenePresence.IsChildAgent)
return; return;
@ -571,6 +572,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
{ {
client.SendAnimations(animations, seqs, m_scenePresence.ControllingClient.AgentId, objectIDs); client.SendAnimations(animations, seqs, m_scenePresence.ControllingClient.AgentId, objectIDs);
}); });
*/
m_scenePresence.SendAnimPack(animations, seqs, objectIDs);
} }
public void SendAnimPackToClient(IClientAPI client) public void SendAnimPackToClient(IClientAPI client)
@ -602,7 +605,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); 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) public string GetAnimName(UUID animId)