aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-08-17 09:54:38 +0100
committerUbitUmarov2014-08-17 09:54:38 +0100
commit31a2c07e833cab6ca2f14e493fd1b96e776097c2 (patch)
treec2ec7f0dadfe918830ee31e527e3fa715c4df5f6 /OpenSim
parentTEST disable again baked textures on crossing (diff)
downloadopensim-SC_OLD-31a2c07e833cab6ca2f14e493fd1b96e776097c2.zip
opensim-SC_OLD-31a2c07e833cab6ca2f14e493fd1b96e776097c2.tar.gz
opensim-SC_OLD-31a2c07e833cab6ca2f14e493fd1b96e776097c2.tar.bz2
opensim-SC_OLD-31a2c07e833cab6ca2f14e493fd1b96e776097c2.tar.xz
put bake bakes, plus a missing change forcing animations to pass by
scenepresence
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs6
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 687871e..feeb0d5 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
1681 AgentData cAgent = new AgentData(); 1681 AgentData cAgent = new AgentData();
1682 agent.CopyTo(cAgent); 1682 agent.CopyTo(cAgent);
1683 1683
1684 agent.Appearance.WearableCacheItems = null; 1684// agent.Appearance.WearableCacheItems = null;
1685 1685
1686 cAgent.Position = pos + agent.Velocity; 1686 cAgent.Position = pos + agent.Velocity;
1687 if (isFlying) 1687 if (isFlying)
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index ecd6a09..668087f 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
557 /// <param name="objectIDs"></param> 557 /// <param name="objectIDs"></param>
558 public void SendAnimPack(UUID[] animations, int[] seqs, UUID[] objectIDs) 558 public void SendAnimPack(UUID[] animations, int[] seqs, UUID[] objectIDs)
559 { 559 {
560/*
560 if (m_scenePresence.IsChildAgent) 561 if (m_scenePresence.IsChildAgent)
561 return; 562 return;
562 563
@@ -571,6 +572,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
571 { 572 {
572 client.SendAnimations(animations, seqs, m_scenePresence.ControllingClient.AgentId, objectIDs); 573 client.SendAnimations(animations, seqs, m_scenePresence.ControllingClient.AgentId, objectIDs);
573 }); 574 });
575 */
576 m_scenePresence.SendAnimPack(animations, seqs, objectIDs);
574 } 577 }
575 578
576 public void SendAnimPackToClient(IClientAPI client) 579 public void SendAnimPackToClient(IClientAPI client)
@@ -602,7 +605,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
602 605
603 m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); 606 m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs);
604 607
605 SendAnimPack(animIDs, sequenceNums, objectIDs); 608// SendAnimPack(animIDs, sequenceNums, objectIDs);
609 m_scenePresence.SendAnimPack(animIDs, sequenceNums, objectIDs);
606 } 610 }
607 611
608 public string GetAnimName(UUID animId) 612 public string GetAnimName(UUID animId)