aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs34
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 9343ad3..9732d05 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -754,7 +754,7 @@ namespace OpenSim.Region.Environment.Scenes
754 /// <summary> 754 /// <summary>
755 /// This is the event handler for client movement. If a client is moving, this event is triggering. 755 /// This is the event handler for client movement. If a client is moving, this event is triggering.
756 /// </summary> 756 /// </summary>
757 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdatePacket agentData) 757 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
758 { 758 {
759 //if (m_isChildAgent) 759 //if (m_isChildAgent)
760 //{ 760 //{
@@ -767,31 +767,31 @@ namespace OpenSim.Region.Environment.Scenes
767 767
768 m_perfMonMS = System.Environment.TickCount; 768 m_perfMonMS = System.Environment.TickCount;
769 769
770 uint flags = agentData.AgentData.ControlFlags; 770 uint flags = agentData.ControlFlags;
771 LLQuaternion bodyRotation = agentData.AgentData.BodyRotation; 771 LLQuaternion bodyRotation = agentData.BodyRotation;
772 772
773 // Camera location in world. We'll need to raytrace 773 // Camera location in world. We'll need to raytrace
774 // from this location from time to time. 774 // from this location from time to time.
775 m_CameraCenter.x = agentData.AgentData.CameraCenter.X; 775 m_CameraCenter.x = agentData.CameraCenter.X;
776 m_CameraCenter.y = agentData.AgentData.CameraCenter.Y; 776 m_CameraCenter.y = agentData.CameraCenter.Y;
777 m_CameraCenter.z = agentData.AgentData.CameraCenter.Z; 777 m_CameraCenter.z = agentData.CameraCenter.Z;
778 778
779 // Use these three vectors to figure out what the agent is looking at 779 // Use these three vectors to figure out what the agent is looking at
780 // Convert it to a Matrix and/or Quaternion 780 // Convert it to a Matrix and/or Quaternion
781 m_CameraAtAxis.x = agentData.AgentData.CameraAtAxis.X; 781 m_CameraAtAxis.x = agentData.CameraAtAxis.X;
782 m_CameraAtAxis.y = agentData.AgentData.CameraAtAxis.Y; 782 m_CameraAtAxis.y = agentData.CameraAtAxis.Y;
783 m_CameraAtAxis.z = agentData.AgentData.CameraAtAxis.Z; 783 m_CameraAtAxis.z = agentData.CameraAtAxis.Z;
784 784
785 m_CameraLeftAxis.x = agentData.AgentData.CameraLeftAxis.X; 785 m_CameraLeftAxis.x = agentData.CameraLeftAxis.X;
786 m_CameraLeftAxis.y = agentData.AgentData.CameraLeftAxis.Y; 786 m_CameraLeftAxis.y = agentData.CameraLeftAxis.Y;
787 m_CameraLeftAxis.z = agentData.AgentData.CameraLeftAxis.Z; 787 m_CameraLeftAxis.z = agentData.CameraLeftAxis.Z;
788 788
789 m_CameraUpAxis.x = agentData.AgentData.CameraUpAxis.X; 789 m_CameraUpAxis.x = agentData.CameraUpAxis.X;
790 m_CameraUpAxis.y = agentData.AgentData.CameraUpAxis.Y; 790 m_CameraUpAxis.y = agentData.CameraUpAxis.Y;
791 m_CameraUpAxis.z = agentData.AgentData.CameraUpAxis.Z; 791 m_CameraUpAxis.z = agentData.CameraUpAxis.Z;
792 792
793 // The Agent's Draw distance setting 793 // The Agent's Draw distance setting
794 m_DrawDistance = agentData.AgentData.Far; 794 m_DrawDistance = agentData.Far;
795 795
796 if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) 796 if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
797 { 797 {
@@ -1569,7 +1569,7 @@ namespace OpenSim.Region.Environment.Scenes
1569 m_appearance.SendAppearanceToOtherAgent(avatar); 1569 m_appearance.SendAppearanceToOtherAgent(avatar);
1570 } 1570 }
1571 1571
1572 public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam) 1572 public void SetAppearance(byte[] texture, List<byte> visualParam)
1573 { 1573 {
1574 m_appearance.SetAppearance(texture, visualParam); 1574 m_appearance.SetAppearance(texture, visualParam);
1575 SetHeight(m_appearance.AvatarHeight); 1575 SetHeight(m_appearance.AvatarHeight);