diff options
author | John Hurliman | 2009-10-15 16:35:27 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-15 16:35:27 -0700 |
commit | 4b75353cbf50de3cae4c48ec90b55f30c1612c92 (patch) | |
tree | 2b5bf30d2a0c8558437f757e28081cb60a8b5dfc /OpenSim | |
parent | Replaced the update lists with a priority queue implementation in LLClientView (diff) | |
download | opensim-SC-4b75353cbf50de3cae4c48ec90b55f30c1612c92.zip opensim-SC-4b75353cbf50de3cae4c48ec90b55f30c1612c92.tar.gz opensim-SC-4b75353cbf50de3cae4c48ec90b55f30c1612c92.tar.bz2 opensim-SC-4b75353cbf50de3cae4c48ec90b55f30c1612c92.tar.xz |
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
Diffstat (limited to '')
20 files changed, 573 insertions, 402 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index bc02bc4..ea29c41 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -996,19 +996,19 @@ namespace OpenSim.Client.MXP.ClientStack | |||
996 | // Need to translate to MXP somehow | 996 | // Need to translate to MXP somehow |
997 | } | 997 | } |
998 | 998 | ||
999 | public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 position, byte[] textureEntry, uint parentID, Quaternion rotation) | 999 | public void SendAvatarData(SendAvatarData data) |
1000 | { | 1000 | { |
1001 | //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID); | 1001 | //ScenePresence presence=((Scene)this.Scene).GetScenePresence(avatarID); |
1002 | UUID ownerID = avatarID; | 1002 | UUID ownerID = data.avatarID; |
1003 | MXPSendAvatarData(firstName + " " + lastName, ownerID, UUID.Zero, avatarID, avatarLocalID, position, rotation); | 1003 | MXPSendAvatarData(data.firstName + " " + data.lastName, ownerID, UUID.Zero, data.avatarID, data.avatarLocalID, data.Pos, data.rotation); |
1004 | } | 1004 | } |
1005 | 1005 | ||
1006 | public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID uuid) | 1006 | public void SendAvatarTerseUpdate(SendAvatarTerseData data) |
1007 | { | 1007 | { |
1008 | MovementEventMessage me = new MovementEventMessage(); | 1008 | MovementEventMessage me = new MovementEventMessage(); |
1009 | me.ObjectIndex = localID; | 1009 | me.ObjectIndex = data.localID; |
1010 | me.Location =ToOmVector(position); | 1010 | me.Location = ToOmVector(data.position); |
1011 | me.Orientation = ToOmQuaternion(rotation); | 1011 | me.Orientation = ToOmQuaternion(data.rotation); |
1012 | 1012 | ||
1013 | Session.Send(me); | 1013 | Session.Send(me); |
1014 | } | 1014 | } |
@@ -1028,22 +1028,17 @@ namespace OpenSim.Client.MXP.ClientStack | |||
1028 | // Need to translate to MXP somehow | 1028 | // Need to translate to MXP somehow |
1029 | } | 1029 | } |
1030 | 1030 | ||
1031 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | 1031 | public void SendPrimitiveToClient(SendPrimitiveData data) |
1032 | { | 1032 | { |
1033 | MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation, flags,text,color,parentID,particleSystem,clickAction,material,textureanim); | 1033 | MXPSendPrimitive(data.localID, data.ownerID, data.acc, data.rvel, data.primShape, data.pos, data.objectID, data.vel, data.rotation, data.flags, data.text, data.color, data.parentID, data.particleSystem, data.clickAction, data.material, data.textureanim); |
1034 | } | 1034 | } |
1035 | 1035 | ||
1036 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material) | 1036 | public void SendPrimTerseUpdate(SendPrimitiveTerseData data) |
1037 | { | ||
1038 | MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation, flags, text, color, parentID, particleSystem, clickAction, material, new byte[0]); | ||
1039 | } | ||
1040 | |||
1041 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint) | ||
1042 | { | 1037 | { |
1043 | MovementEventMessage me = new MovementEventMessage(); | 1038 | MovementEventMessage me = new MovementEventMessage(); |
1044 | me.ObjectIndex = localID; | 1039 | me.ObjectIndex = data.localID; |
1045 | me.Location = ToOmVector(position); | 1040 | me.Location = ToOmVector(data.position); |
1046 | me.Orientation = ToOmQuaternion(rotation); | 1041 | me.Orientation = ToOmQuaternion(data.rotation); |
1047 | Session.Send(me); | 1042 | Session.Send(me); |
1048 | } | 1043 | } |
1049 | 1044 | ||
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index e3abcf5..3a48a03 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
@@ -560,12 +560,12 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
560 | throw new System.NotImplementedException(); | 560 | throw new System.NotImplementedException(); |
561 | } | 561 | } |
562 | 562 | ||
563 | public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) | 563 | public void SendAvatarData(SendAvatarData data) |
564 | { | 564 | { |
565 | throw new System.NotImplementedException(); | 565 | throw new System.NotImplementedException(); |
566 | } | 566 | } |
567 | 567 | ||
568 | public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID uuid) | 568 | public void SendAvatarTerseUpdate(SendAvatarTerseData data) |
569 | { | 569 | { |
570 | throw new System.NotImplementedException(); | 570 | throw new System.NotImplementedException(); |
571 | } | 571 | } |
@@ -585,17 +585,12 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
585 | throw new System.NotImplementedException(); | 585 | throw new System.NotImplementedException(); |
586 | } | 586 | } |
587 | 587 | ||
588 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | 588 | public void SendPrimitiveToClient(SendPrimitiveData data) |
589 | { | 589 | { |
590 | throw new System.NotImplementedException(); | 590 | throw new System.NotImplementedException(); |
591 | } | 591 | } |
592 | 592 | ||
593 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material) | 593 | public void SendPrimTerseUpdate(SendPrimitiveTerseData data) |
594 | { | ||
595 | throw new System.NotImplementedException(); | ||
596 | } | ||
597 | |||
598 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint) | ||
599 | { | 594 | { |
600 | throw new System.NotImplementedException(); | 595 | throw new System.NotImplementedException(); |
601 | } | 596 | } |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 29846f5..4b51e15 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -517,6 +517,233 @@ namespace OpenSim.Framework | |||
517 | public float dwell; | 517 | public float dwell; |
518 | } | 518 | } |
519 | 519 | ||
520 | public struct SendAvatarData | ||
521 | { | ||
522 | private ulong m_regionHandle; | ||
523 | private string m_firstName; | ||
524 | private string m_lastName; | ||
525 | private string m_grouptitle; | ||
526 | private UUID m_avatarID; | ||
527 | private uint m_avatarLocalID; | ||
528 | private Vector3 m_Pos; | ||
529 | private byte[] m_textureEntry; | ||
530 | private uint m_parentID; | ||
531 | private Quaternion m_rotation; | ||
532 | |||
533 | public SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, | ||
534 | uint avatarLocalID, | ||
535 | Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) | ||
536 | { | ||
537 | this.m_regionHandle = regionHandle; | ||
538 | this.m_firstName = firstName; | ||
539 | this.m_lastName = lastName; | ||
540 | this.m_grouptitle = grouptitle; | ||
541 | this.m_avatarID = avatarID; | ||
542 | this.m_avatarLocalID = avatarLocalID; | ||
543 | this.m_Pos = Pos; | ||
544 | this.m_textureEntry = textureEntry; | ||
545 | this.m_parentID = parentID; | ||
546 | this.m_rotation = rotation; | ||
547 | } | ||
548 | |||
549 | public ulong regionHandle { get { return this.m_regionHandle; } } | ||
550 | public string firstName { get { return this.m_firstName; } } | ||
551 | public string lastName { get { return this.m_lastName; } } | ||
552 | public string grouptitle { get { return this.m_grouptitle; } } | ||
553 | public UUID avatarID { get { return this.m_avatarID; } } | ||
554 | public uint avatarLocalID { get { return this.m_avatarLocalID; } } | ||
555 | public Vector3 Pos { get { return this.m_Pos; } } | ||
556 | public byte[] textureEntry { get { return this.m_textureEntry; } } | ||
557 | public uint parentID { get { return this.m_parentID; } } | ||
558 | public Quaternion rotation { get { return this.m_rotation; } } | ||
559 | } | ||
560 | |||
561 | public struct SendAvatarTerseData | ||
562 | { | ||
563 | private ulong m_regionHandle; | ||
564 | private ushort m_timeDilation; | ||
565 | private uint m_localID; | ||
566 | private Vector3 m_position; | ||
567 | private Vector3 m_velocity; | ||
568 | private Quaternion m_rotation; | ||
569 | private UUID m_agentid; | ||
570 | private double m_priority; | ||
571 | |||
572 | public SendAvatarTerseData(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, | ||
573 | Vector3 velocity, Quaternion rotation, UUID agentid, double priority) | ||
574 | { | ||
575 | this.m_regionHandle = regionHandle; | ||
576 | this.m_timeDilation = timeDilation; | ||
577 | this.m_localID = localID; | ||
578 | this.m_position = position; | ||
579 | this.m_velocity = velocity; | ||
580 | this.m_rotation = rotation; | ||
581 | this.m_agentid = agentid; | ||
582 | this.m_priority = priority; | ||
583 | } | ||
584 | |||
585 | public ulong regionHandle { get { return this.m_regionHandle; } } | ||
586 | public ushort timeDilation { get { return this.m_timeDilation; } } | ||
587 | public uint localID { get { return this.m_localID; } } | ||
588 | public Vector3 position { get { return this.m_position; } } | ||
589 | public Vector3 velocity { get { return this.m_velocity; } } | ||
590 | public Quaternion rotation { get { return this.m_rotation; } } | ||
591 | public UUID agentid { get { return this.m_agentid; } } | ||
592 | public double priority { get { return this.m_priority; } } | ||
593 | } | ||
594 | |||
595 | public struct SendPrimitiveTerseData | ||
596 | { | ||
597 | private ulong m_regionHandle; | ||
598 | private ushort m_timeDilation; | ||
599 | private uint m_localID; | ||
600 | private Vector3 m_position; | ||
601 | private Quaternion m_rotation; | ||
602 | private Vector3 m_velocity; | ||
603 | private Vector3 m_rotationalvelocity; | ||
604 | private byte m_state; | ||
605 | private UUID m_AssetId; | ||
606 | private UUID m_owner; | ||
607 | private int m_attachPoint; | ||
608 | private double m_priority; | ||
609 | |||
610 | public SendPrimitiveTerseData(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, | ||
611 | Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, | ||
612 | UUID AssetId, UUID owner, int attachPoint, double priority) | ||
613 | { | ||
614 | this.m_regionHandle = regionHandle; | ||
615 | this.m_timeDilation = timeDilation; | ||
616 | this.m_localID = localID; | ||
617 | this.m_position = position; | ||
618 | this.m_rotation = rotation; | ||
619 | this.m_velocity = velocity; | ||
620 | this.m_rotationalvelocity = rotationalvelocity; | ||
621 | this.m_state = state; | ||
622 | this.m_AssetId = AssetId; | ||
623 | this.m_owner = owner; | ||
624 | this.m_attachPoint = attachPoint; | ||
625 | this.m_priority = priority; | ||
626 | } | ||
627 | |||
628 | public ulong regionHandle { get { return this.m_regionHandle; } } | ||
629 | public ushort timeDilation { get { return this.m_timeDilation; } } | ||
630 | public uint localID { get { return this.m_localID; } } | ||
631 | public Vector3 position { get { return this.m_position; } } | ||
632 | public Quaternion rotation { get { return this.m_rotation; } } | ||
633 | public Vector3 velocity { get { return this.m_velocity; } } | ||
634 | public Vector3 rotationalvelocity { get { return this.m_rotationalvelocity; } } | ||
635 | public byte state { get { return this.m_state; } } | ||
636 | public UUID AssetId { get { return this.m_AssetId; } } | ||
637 | public UUID owner { get { return this.m_owner; } } | ||
638 | public int attachPoint { get { return this.m_attachPoint; } } | ||
639 | public double priority { get { return this.m_priority; } } | ||
640 | } | ||
641 | |||
642 | public struct SendPrimitiveData | ||
643 | { | ||
644 | private ulong m_regionHandle; | ||
645 | private ushort m_timeDilation; | ||
646 | private uint m_localID; | ||
647 | private PrimitiveBaseShape m_primShape; | ||
648 | private Vector3 m_pos; | ||
649 | private Vector3 m_vel; | ||
650 | private Vector3 m_acc; | ||
651 | private Quaternion m_rotation; | ||
652 | private Vector3 m_rvel; | ||
653 | private uint m_flags; | ||
654 | private UUID m_objectID; | ||
655 | private UUID m_ownerID; | ||
656 | private string m_text; | ||
657 | private byte[] m_color; | ||
658 | private uint m_parentID; | ||
659 | private byte[] m_particleSystem; | ||
660 | private byte m_clickAction; | ||
661 | private byte m_material; | ||
662 | private byte[] m_textureanim; | ||
663 | private bool m_attachment; | ||
664 | private uint m_AttachPoint; | ||
665 | private UUID m_AssetId; | ||
666 | private UUID m_SoundId; | ||
667 | private double m_SoundVolume; | ||
668 | private byte m_SoundFlags; | ||
669 | private double m_SoundRadius; | ||
670 | private double m_priority; | ||
671 | |||
672 | public SendPrimitiveData(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, | ||
673 | Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, | ||
674 | uint flags, UUID objectID, UUID ownerID, string text, byte[] color, | ||
675 | uint parentID, byte[] particleSystem, byte clickAction, byte material, double priority) : | ||
676 | this(regionHandle, timeDilation, localID, primShape, pos, vel, acc, rotation, rvel, flags, objectID, | ||
677 | ownerID, text, color, parentID, particleSystem, clickAction, material, new byte[0], false, 0, UUID.Zero, | ||
678 | UUID.Zero, 0, 0, 0, priority) { } | ||
679 | |||
680 | public SendPrimitiveData(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, | ||
681 | Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, | ||
682 | uint flags, | ||
683 | UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, | ||
684 | byte[] particleSystem, | ||
685 | byte clickAction, byte material, byte[] textureanim, bool attachment, | ||
686 | uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, | ||
687 | double SoundRadius, double priority) | ||
688 | { | ||
689 | this.m_regionHandle = regionHandle; | ||
690 | this.m_timeDilation = timeDilation; | ||
691 | this.m_localID = localID; | ||
692 | this.m_primShape = primShape; | ||
693 | this.m_pos = pos; | ||
694 | this.m_vel = vel; | ||
695 | this.m_acc = acc; | ||
696 | this.m_rotation = rotation; | ||
697 | this.m_rvel = rvel; | ||
698 | this.m_flags = flags; | ||
699 | this.m_objectID = objectID; | ||
700 | this.m_ownerID = ownerID; | ||
701 | this.m_text = text; | ||
702 | this.m_color = color; | ||
703 | this.m_parentID = parentID; | ||
704 | this.m_particleSystem = particleSystem; | ||
705 | this.m_clickAction = clickAction; | ||
706 | this.m_material = material; | ||
707 | this.m_textureanim = textureanim; | ||
708 | this.m_attachment = attachment; | ||
709 | this.m_AttachPoint = AttachPoint; | ||
710 | this.m_AssetId = AssetId; | ||
711 | this.m_SoundId = SoundId; | ||
712 | this.m_SoundVolume = SoundVolume; | ||
713 | this.m_SoundFlags = SoundFlags; | ||
714 | this.m_SoundRadius = SoundRadius; | ||
715 | this.m_priority = priority; | ||
716 | } | ||
717 | |||
718 | public ulong regionHandle { get { return this.m_regionHandle; } } | ||
719 | public ushort timeDilation { get { return this.m_timeDilation; } } | ||
720 | public uint localID { get { return this.m_localID; } } | ||
721 | public PrimitiveBaseShape primShape { get { return this.m_primShape; } } | ||
722 | public Vector3 pos { get { return this.m_pos; } } | ||
723 | public Vector3 vel { get { return this.m_vel; } } | ||
724 | public Vector3 acc { get { return this.m_acc; } } | ||
725 | public Quaternion rotation { get { return this.m_rotation; } } | ||
726 | public Vector3 rvel { get { return this.m_rvel; } } | ||
727 | public uint flags { get { return this.m_flags; } } | ||
728 | public UUID objectID { get { return this.m_objectID; } } | ||
729 | public UUID ownerID { get { return this.m_ownerID; } } | ||
730 | public string text { get { return this.m_text; } } | ||
731 | public byte[] color { get { return this.m_color; } } | ||
732 | public uint parentID { get { return this.m_parentID; } } | ||
733 | public byte[] particleSystem { get { return this.m_particleSystem; } } | ||
734 | public byte clickAction { get { return this.m_clickAction; } } | ||
735 | public byte material { get { return this.m_material; } } | ||
736 | public byte[] textureanim { get { return this.m_textureanim; } } | ||
737 | public bool attachment { get { return this.m_attachment; } } | ||
738 | public uint AttachPoint { get { return this.m_AttachPoint; } } | ||
739 | public UUID AssetId { get { return this.m_AssetId; } } | ||
740 | public UUID SoundId { get { return this.m_SoundId; } } | ||
741 | public double SoundVolume { get { return this.m_SoundVolume; } } | ||
742 | public byte SoundFlags { get { return this.m_SoundFlags; } } | ||
743 | public double SoundRadius { get { return this.m_SoundRadius; } } | ||
744 | public double priority { get { return this.m_priority; } } | ||
745 | } | ||
746 | |||
520 | public interface IClientAPI | 747 | public interface IClientAPI |
521 | { | 748 | { |
522 | Vector3 StartPos { get; set; } | 749 | Vector3 StartPos { get; set; } |
@@ -877,37 +1104,18 @@ namespace OpenSim.Framework | |||
877 | void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); | 1104 | void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance); |
878 | void SendPayPrice(UUID objectID, int[] payPrice); | 1105 | void SendPayPrice(UUID objectID, int[] payPrice); |
879 | 1106 | ||
880 | void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, | 1107 | void SendAvatarData(SendAvatarData data); |
881 | uint avatarLocalID, | ||
882 | Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation); | ||
883 | 1108 | ||
884 | void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, | 1109 | void SendAvatarTerseUpdate(SendAvatarTerseData data); |
885 | Vector3 velocity, Quaternion rotation, UUID agentid); | ||
886 | 1110 | ||
887 | void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations); | 1111 | void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations); |
888 | 1112 | ||
889 | void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID); | 1113 | void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID); |
890 | void SetChildAgentThrottle(byte[] throttle); | 1114 | void SetChildAgentThrottle(byte[] throttle); |
891 | 1115 | ||
892 | void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, | 1116 | void SendPrimitiveToClient(SendPrimitiveData data); |
893 | Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, | ||
894 | uint flags, | ||
895 | UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, | ||
896 | byte[] particleSystem, | ||
897 | byte clickAction, byte material, byte[] textureanim, bool attachment, | ||
898 | uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, | ||
899 | double SoundRadius); | ||
900 | |||
901 | 1117 | ||
902 | void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, | 1118 | void SendPrimTerseUpdate(SendPrimitiveTerseData data); |
903 | Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, | ||
904 | uint flags, UUID objectID, UUID ownerID, string text, byte[] color, | ||
905 | uint parentID, byte[] particleSystem, byte clickAction, byte material); | ||
906 | |||
907 | |||
908 | void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, | ||
909 | Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, | ||
910 | UUID AssetId, UUID owner, int attachPoint); | ||
911 | 1119 | ||
912 | void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, | 1120 | void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, |
913 | List<InventoryFolderBase> folders, bool fetchFolders, | 1121 | List<InventoryFolderBase> folders, bool fetchFolders, |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 93fdeef..0a7d923 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -320,14 +320,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
320 | private readonly IGroupsModule m_GroupsModule; | 320 | private readonly IGroupsModule m_GroupsModule; |
321 | 321 | ||
322 | private int m_cachedTextureSerial; | 322 | private int m_cachedTextureSerial; |
323 | private Timer m_avatarTerseUpdateTimer; | 323 | private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates = |
324 | private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_avatarTerseUpdates_ = | ||
325 | new PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(); | 324 | new PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(); |
326 | private Timer m_primTerseUpdateTimer; | 325 | private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates = |
327 | private PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock> m_primTerseUpdates_ = | ||
328 | new PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(); | 326 | new PriorityQueue<double, ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(); |
329 | private Timer m_primFullUpdateTimer; | 327 | private PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates = |
330 | private PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates_ = | ||
331 | new PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>(); | 328 | new PriorityQueue<double, ObjectUpdatePacket.ObjectDataBlock>(); |
332 | private int m_moneyBalance; | 329 | private int m_moneyBalance; |
333 | private int m_animationSequenceNumber = 1; | 330 | private int m_animationSequenceNumber = 1; |
@@ -353,9 +350,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
353 | // LL uses these limits, apparently. Compressed terse would be 23, but we don't have that yet | 350 | // LL uses these limits, apparently. Compressed terse would be 23, but we don't have that yet |
354 | protected int m_primTerseUpdatesPerPacket = 10; | 351 | protected int m_primTerseUpdatesPerPacket = 10; |
355 | protected int m_primFullUpdatesPerPacket = 14; | 352 | protected int m_primFullUpdatesPerPacket = 14; |
356 | protected int m_primTerseUpdateRate = 10; | ||
357 | protected int m_primFullUpdateRate = 14; | ||
358 | protected int m_avatarTerseUpdateRate = 50; | ||
359 | protected int m_avatarTerseUpdatesPerPacket = 5; | 353 | protected int m_avatarTerseUpdatesPerPacket = 5; |
360 | /// <summary>Number of texture packets to put on the queue each time the | 354 | /// <summary>Number of texture packets to put on the queue each time the |
361 | /// OnQueueEmpty event is triggered for the texture category</summary> | 355 | /// OnQueueEmpty event is triggered for the texture category</summary> |
@@ -479,25 +473,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
479 | // Remove ourselves from the scene | 473 | // Remove ourselves from the scene |
480 | m_scene.RemoveClient(AgentId); | 474 | m_scene.RemoveClient(AgentId); |
481 | 475 | ||
482 | // Shut down timers. Thread Context of this method is murky. Lock all timers | ||
483 | if (m_avatarTerseUpdateTimer.Enabled) | ||
484 | lock (m_avatarTerseUpdateTimer) | ||
485 | m_avatarTerseUpdateTimer.Stop(); | ||
486 | if (m_primTerseUpdateTimer.Enabled) | ||
487 | lock (m_primTerseUpdateTimer) | ||
488 | m_primTerseUpdateTimer.Stop(); | ||
489 | if (m_primFullUpdateTimer.Enabled) | ||
490 | lock (m_primFullUpdateTimer) | ||
491 | m_primFullUpdateTimer.Stop(); | ||
492 | |||
493 | // We can't reach into other scenes and close the connection | 476 | // We can't reach into other scenes and close the connection |
494 | // We need to do this over grid communications | 477 | // We need to do this over grid communications |
495 | //m_scene.CloseAllAgents(CircuitCode); | 478 | //m_scene.CloseAllAgents(CircuitCode); |
496 | 479 | ||
497 | m_avatarTerseUpdateTimer.Dispose(); | ||
498 | m_primTerseUpdateTimer.Dispose(); | ||
499 | m_primFullUpdateTimer.Dispose(); | ||
500 | |||
501 | // Disable UDP handling for this client | 480 | // Disable UDP handling for this client |
502 | m_udpClient.Shutdown(); | 481 | m_udpClient.Shutdown(); |
503 | 482 | ||
@@ -524,18 +503,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
524 | 503 | ||
525 | public void Stop() | 504 | public void Stop() |
526 | { | 505 | { |
527 | // Shut down timers. Thread Context is Murky, lock all timers! | ||
528 | if (m_avatarTerseUpdateTimer.Enabled) | ||
529 | lock (m_avatarTerseUpdateTimer) | ||
530 | m_avatarTerseUpdateTimer.Stop(); | ||
531 | |||
532 | if (m_primTerseUpdateTimer.Enabled) | ||
533 | lock (m_primTerseUpdateTimer) | ||
534 | m_primTerseUpdateTimer.Stop(); | ||
535 | 506 | ||
536 | if (m_primFullUpdateTimer.Enabled) | ||
537 | lock (m_primFullUpdateTimer) | ||
538 | m_primFullUpdateTimer.Stop(); | ||
539 | } | 507 | } |
540 | 508 | ||
541 | #endregion Client Methods | 509 | #endregion Client Methods |
@@ -631,18 +599,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
631 | 599 | ||
632 | public virtual void Start() | 600 | public virtual void Start() |
633 | { | 601 | { |
634 | m_avatarTerseUpdateTimer = new Timer(m_avatarTerseUpdateRate); | ||
635 | m_avatarTerseUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessAvatarTerseUpdates); | ||
636 | m_avatarTerseUpdateTimer.AutoReset = false; | ||
637 | |||
638 | m_primTerseUpdateTimer = new Timer(m_primTerseUpdateRate); | ||
639 | m_primTerseUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessPrimTerseUpdates); | ||
640 | m_primTerseUpdateTimer.AutoReset = false; | ||
641 | |||
642 | m_primFullUpdateTimer = new Timer(m_primFullUpdateRate); | ||
643 | m_primFullUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessPrimFullUpdates); | ||
644 | m_primFullUpdateTimer.AutoReset = false; | ||
645 | |||
646 | m_scene.AddNewClient(this); | 602 | m_scene.AddNewClient(this); |
647 | 603 | ||
648 | RefreshGroupMembership(); | 604 | RefreshGroupMembership(); |
@@ -3394,28 +3350,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3394 | /// <summary> | 3350 | /// <summary> |
3395 | /// send a objectupdate packet with information about the clients avatar | 3351 | /// send a objectupdate packet with information about the clients avatar |
3396 | /// </summary> | 3352 | /// </summary> |
3397 | public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, | 3353 | public void SendAvatarData(SendAvatarData data) |
3398 | uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) | ||
3399 | { | 3354 | { |
3400 | ObjectUpdatePacket objupdate = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); | 3355 | ObjectUpdatePacket objupdate = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); |
3401 | // TODO: don't create new blocks if recycling an old packet | 3356 | // TODO: don't create new blocks if recycling an old packet |
3402 | objupdate.RegionData.RegionHandle = regionHandle; | 3357 | objupdate.RegionData.RegionHandle = data.regionHandle; |
3403 | objupdate.RegionData.TimeDilation = ushort.MaxValue; | 3358 | objupdate.RegionData.TimeDilation = ushort.MaxValue; |
3404 | objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; | 3359 | objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; |
3405 | objupdate.ObjectData[0] = CreateDefaultAvatarPacket(textureEntry); | 3360 | objupdate.ObjectData[0] = CreateDefaultAvatarPacket(data.textureEntry); |
3406 | 3361 | ||
3407 | //give this avatar object a local id and assign the user a name | 3362 | //give this avatar object a local id and assign the user a name |
3408 | objupdate.ObjectData[0].ID = avatarLocalID; | 3363 | objupdate.ObjectData[0].ID = data.avatarLocalID; |
3409 | objupdate.ObjectData[0].FullID = avatarID; | 3364 | objupdate.ObjectData[0].FullID = data.avatarID; |
3410 | objupdate.ObjectData[0].ParentID = parentID; | 3365 | objupdate.ObjectData[0].ParentID = data.parentID; |
3411 | objupdate.ObjectData[0].NameValue = | 3366 | objupdate.ObjectData[0].NameValue = |
3412 | Utils.StringToBytes("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName + "\nTitle STRING RW SV " + grouptitle); | 3367 | Utils.StringToBytes("FirstName STRING RW SV " + data.firstName + "\nLastName STRING RW SV " + data.lastName + "\nTitle STRING RW SV " + data.grouptitle); |
3413 | 3368 | ||
3414 | Vector3 pos2 = new Vector3(Pos.X, Pos.Y, Pos.Z); | 3369 | Vector3 pos2 = new Vector3(data.Pos.X, data.Pos.Y, data.Pos.Z); |
3415 | byte[] pb = pos2.GetBytes(); | 3370 | byte[] pb = pos2.GetBytes(); |
3416 | Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length); | 3371 | Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length); |
3417 | 3372 | ||
3418 | byte[] rot = rotation.GetBytes(); | 3373 | byte[] rot = data.rotation.GetBytes(); |
3419 | Array.Copy(rot, 0, objupdate.ObjectData[0].ObjectData, 52, rot.Length); | 3374 | Array.Copy(rot, 0, objupdate.ObjectData[0].ObjectData, 52, rot.Length); |
3420 | 3375 | ||
3421 | objupdate.Header.Zerocoded = true; | 3376 | objupdate.Header.Zerocoded = true; |
@@ -3426,38 +3381,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3426 | /// Send a terse positional/rotation/velocity update about an avatar | 3381 | /// Send a terse positional/rotation/velocity update about an avatar |
3427 | /// to the client. This avatar can be that of the client itself. | 3382 | /// to the client. This avatar can be that of the client itself. |
3428 | /// </summary> | 3383 | /// </summary> |
3429 | public virtual void SendAvatarTerseUpdate(ulong regionHandle, | 3384 | public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data) |
3430 | ushort timeDilation, uint localID, Vector3 position, | ||
3431 | Vector3 velocity, Quaternion rotation, UUID agentid) | ||
3432 | { | 3385 | { |
3386 | if (data.priority == double.NaN) | ||
3387 | { | ||
3388 | m_log.Error("[LLClientView] SendAvatarTerseUpdate received a NaN priority, dropping update"); | ||
3389 | return; | ||
3390 | } | ||
3391 | |||
3392 | Quaternion rotation = data.rotation; | ||
3393 | |||
3433 | if (rotation.X == rotation.Y && | 3394 | if (rotation.X == rotation.Y && |
3434 | rotation.Y == rotation.Z && | 3395 | rotation.Y == rotation.Z && |
3435 | rotation.Z == rotation.W && rotation.W == 0) | 3396 | rotation.Z == rotation.W && rotation.W == 0) |
3436 | rotation = Quaternion.Identity; | 3397 | rotation = Quaternion.Identity; |
3437 | 3398 | ||
3438 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = | 3399 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = |
3439 | CreateAvatarImprovedBlock(localID, position, velocity,rotation); | 3400 | CreateAvatarImprovedBlock(data.localID, data.position, data.velocity, rotation); |
3440 | 3401 | ||
3441 | lock (m_avatarTerseUpdates_.SyncRoot) | 3402 | lock (m_avatarTerseUpdates.SyncRoot) |
3442 | { | 3403 | m_avatarTerseUpdates.Enqueue(data.priority, terseBlock, data.localID); |
3443 | m_avatarTerseUpdates_.Enqueue(DateTime.Now.ToOADate(), terseBlock, localID); | ||
3444 | |||
3445 | // If packet is full or own movement packet, send it. | ||
3446 | if (m_avatarTerseUpdates_.Count >= m_avatarTerseUpdatesPerPacket) | ||
3447 | { | ||
3448 | ProcessAvatarTerseUpdates(this, null); | ||
3449 | } | ||
3450 | else if (m_avatarTerseUpdates_.Count == 1) | ||
3451 | { | ||
3452 | lock (m_avatarTerseUpdateTimer) | ||
3453 | m_avatarTerseUpdateTimer.Start(); | ||
3454 | } | ||
3455 | } | ||
3456 | } | 3404 | } |
3457 | 3405 | ||
3458 | private void ProcessAvatarTerseUpdates(object sender, ElapsedEventArgs e) | 3406 | private void ProcessAvatarTerseUpdates() |
3459 | { | 3407 | { |
3460 | lock (m_avatarTerseUpdates_.SyncRoot) | 3408 | lock (m_avatarTerseUpdates.SyncRoot) |
3461 | { | 3409 | { |
3462 | ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); | 3410 | ImprovedTerseObjectUpdatePacket terse = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedTerseObjectUpdate); |
3463 | 3411 | ||
@@ -3468,8 +3416,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3468 | (ushort)(Scene.TimeDilation * ushort.MaxValue); | 3416 | (ushort)(Scene.TimeDilation * ushort.MaxValue); |
3469 | 3417 | ||
3470 | int max = m_avatarTerseUpdatesPerPacket; | 3418 | int max = m_avatarTerseUpdatesPerPacket; |
3471 | if (max > m_avatarTerseUpdates_.Count) | 3419 | if (max > m_avatarTerseUpdates.Count) |
3472 | max = m_avatarTerseUpdates_.Count; | 3420 | max = m_avatarTerseUpdates.Count; |
3473 | 3421 | ||
3474 | int count = 0; | 3422 | int count = 0; |
3475 | int size = 0; | 3423 | int size = 0; |
@@ -3482,12 +3430,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3482 | for (count = 0 ; count < max ; count++) | 3430 | for (count = 0 ; count < max ; count++) |
3483 | { | 3431 | { |
3484 | int length = 0; | 3432 | int length = 0; |
3485 | m_avatarTerseUpdates_.Peek().ToBytes(blockbuffer, ref length); | 3433 | m_avatarTerseUpdates.Peek().ToBytes(blockbuffer, ref length); |
3486 | length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer); | 3434 | length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer); |
3487 | if (size + length > Packet.MTU) | 3435 | if (size + length > Packet.MTU) |
3488 | break; | 3436 | break; |
3489 | size += length; | 3437 | size += length; |
3490 | updates.Enqueue(m_avatarTerseUpdates_.Dequeue()); | 3438 | updates.Enqueue(m_avatarTerseUpdates.Dequeue()); |
3491 | } | 3439 | } |
3492 | 3440 | ||
3493 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[count]; | 3441 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[count]; |
@@ -3497,14 +3445,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3497 | 3445 | ||
3498 | terse.Header.Reliable = false; | 3446 | terse.Header.Reliable = false; |
3499 | terse.Header.Zerocoded = true; | 3447 | terse.Header.Zerocoded = true; |
3500 | // FIXME: Move this to ThrottleOutPacketType.State when the real prioritization code is committed | ||
3501 | OutPacket(terse, ThrottleOutPacketType.Task); | ||
3502 | 3448 | ||
3503 | if (m_avatarTerseUpdates_.Count == 0) | 3449 | OutPacket(terse, ThrottleOutPacketType.State); |
3504 | { | ||
3505 | lock (m_avatarTerseUpdateTimer) | ||
3506 | m_avatarTerseUpdateTimer.Stop(); | ||
3507 | } | ||
3508 | } | 3450 | } |
3509 | } | 3451 | } |
3510 | 3452 | ||
@@ -3569,54 +3511,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3569 | OutPacket(attach, ThrottleOutPacketType.Task); | 3511 | OutPacket(attach, ThrottleOutPacketType.Task); |
3570 | } | 3512 | } |
3571 | 3513 | ||
3572 | public void SendPrimitiveToClient( | 3514 | public void SendPrimitiveToClient(SendPrimitiveData data) |
3573 | ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, | ||
3574 | Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, | ||
3575 | uint flags, UUID objectID, UUID ownerID, string text, byte[] color, | ||
3576 | uint parentID, byte[] particleSystem, byte clickAction, byte material) | ||
3577 | { | 3515 | { |
3578 | byte[] textureanim = new byte[0]; | 3516 | if (data.priority == double.NaN) |
3517 | { | ||
3518 | m_log.Error("[LLClientView] SendPrimitiveToClient received a NaN priority, dropping update"); | ||
3519 | return; | ||
3520 | } | ||
3579 | 3521 | ||
3580 | SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, vel, | 3522 | Quaternion rotation = data.rotation; |
3581 | acc, rotation, rvel, flags, | ||
3582 | objectID, ownerID, text, color, parentID, particleSystem, | ||
3583 | clickAction, material, textureanim, false, 0, UUID.Zero, UUID.Zero, 0, 0, 0); | ||
3584 | } | ||
3585 | 3523 | ||
3586 | public void SendPrimitiveToClient( | 3524 | if (data.AttachPoint > 30 && data.ownerID != AgentId) // Someone else's HUD |
3587 | ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, | ||
3588 | Vector3 pos, Vector3 velocity, Vector3 acceleration, Quaternion rotation, Vector3 rotational_velocity, | ||
3589 | uint flags, | ||
3590 | UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, | ||
3591 | byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundGain, byte SoundFlags, double SoundRadius) | ||
3592 | { | ||
3593 | |||
3594 | if (AttachPoint > 30 && ownerID != AgentId) // Someone else's HUD | ||
3595 | return; | 3525 | return; |
3596 | if (primShape.PCode == 9 && primShape.State != 0 && parentID == 0) | 3526 | if (data.primShape.PCode == 9 && data.primShape.State != 0 && data.parentID == 0) |
3597 | return; | 3527 | return; |
3598 | 3528 | ||
3599 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) | 3529 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0.0f) |
3600 | rotation = Quaternion.Identity; | 3530 | rotation = Quaternion.Identity; |
3601 | 3531 | ||
3602 | ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(primShape, flags); | 3532 | ObjectUpdatePacket.ObjectDataBlock objectData = CreatePrimUpdateBlock(data.primShape, data.flags); |
3603 | 3533 | ||
3604 | objectData.ID = localID; | 3534 | objectData.ID = data.localID; |
3605 | objectData.FullID = objectID; | 3535 | objectData.FullID = data.objectID; |
3606 | objectData.OwnerID = ownerID; | 3536 | objectData.OwnerID = data.ownerID; |
3607 | 3537 | ||
3608 | objectData.Text = Util.StringToBytes256(text); | 3538 | objectData.Text = Util.StringToBytes256(data.text); |
3609 | objectData.TextColor[0] = color[0]; | 3539 | objectData.TextColor[0] = data.color[0]; |
3610 | objectData.TextColor[1] = color[1]; | 3540 | objectData.TextColor[1] = data.color[1]; |
3611 | objectData.TextColor[2] = color[2]; | 3541 | objectData.TextColor[2] = data.color[2]; |
3612 | objectData.TextColor[3] = color[3]; | 3542 | objectData.TextColor[3] = data.color[3]; |
3613 | objectData.ParentID = parentID; | 3543 | objectData.ParentID = data.parentID; |
3614 | objectData.PSBlock = particleSystem; | 3544 | objectData.PSBlock = data.particleSystem; |
3615 | objectData.ClickAction = clickAction; | 3545 | objectData.ClickAction = data.clickAction; |
3616 | objectData.Material = material; | 3546 | objectData.Material = data.material; |
3617 | objectData.Flags = 0; | 3547 | objectData.Flags = 0; |
3618 | 3548 | ||
3619 | if (attachment) | 3549 | if (data.attachment) |
3620 | { | 3550 | { |
3621 | // Necessary??? | 3551 | // Necessary??? |
3622 | objectData.JointAxisOrAnchor = new Vector3(0, 0, 2); | 3552 | objectData.JointAxisOrAnchor = new Vector3(0, 0, 2); |
@@ -3624,14 +3554,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3624 | 3554 | ||
3625 | // Item from inventory??? | 3555 | // Item from inventory??? |
3626 | objectData.NameValue = | 3556 | objectData.NameValue = |
3627 | Utils.StringToBytes("AttachItemID STRING RW SV " + AssetId.Guid); | 3557 | Utils.StringToBytes("AttachItemID STRING RW SV " + data.AssetId.Guid); |
3628 | objectData.State = (byte)((AttachPoint % 16) * 16 + (AttachPoint / 16)); | 3558 | objectData.State = (byte)((data.AttachPoint % 16) * 16 + (data.AttachPoint / 16)); |
3629 | } | 3559 | } |
3630 | 3560 | ||
3631 | // Xantor 20080528: Send sound info as well | 3561 | // Xantor 20080528: Send sound info as well |
3632 | // Xantor 20080530: Zero out everything if there's no SoundId, so zerocompression will work again | 3562 | // Xantor 20080530: Zero out everything if there's no SoundId, so zerocompression will work again |
3633 | objectData.Sound = SoundId; | 3563 | objectData.Sound = data.SoundId; |
3634 | if (SoundId == UUID.Zero) | 3564 | if (data.SoundId == UUID.Zero) |
3635 | { | 3565 | { |
3636 | objectData.OwnerID = UUID.Zero; | 3566 | objectData.OwnerID = UUID.Zero; |
3637 | objectData.Gain = 0.0f; | 3567 | objectData.Gain = 0.0f; |
@@ -3640,39 +3570,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3640 | } | 3570 | } |
3641 | else | 3571 | else |
3642 | { | 3572 | { |
3643 | objectData.OwnerID = ownerID; | 3573 | objectData.OwnerID = data.ownerID; |
3644 | objectData.Gain = (float)SoundGain; | 3574 | objectData.Gain = (float)data.SoundVolume; |
3645 | objectData.Radius = (float)SoundRadius; | 3575 | objectData.Radius = (float)data.SoundRadius; |
3646 | objectData.Flags = SoundFlags; | 3576 | objectData.Flags = data.SoundFlags; |
3647 | } | 3577 | } |
3648 | 3578 | ||
3649 | byte[] pb = pos.GetBytes(); | 3579 | byte[] pb = data.pos.GetBytes(); |
3650 | Array.Copy(pb, 0, objectData.ObjectData, 0, pb.Length); | 3580 | Buffer.BlockCopy(pb, 0, objectData.ObjectData, 0, pb.Length); |
3651 | 3581 | ||
3652 | byte[] vel = velocity.GetBytes(); | 3582 | byte[] vel = data.vel.GetBytes(); |
3653 | Array.Copy(vel, 0, objectData.ObjectData, pb.Length, vel.Length); | 3583 | Buffer.BlockCopy(vel, 0, objectData.ObjectData, pb.Length, vel.Length); |
3654 | 3584 | ||
3655 | byte[] rot = rotation.GetBytes(); | 3585 | byte[] rot = rotation.GetBytes(); |
3656 | Array.Copy(rot, 0, objectData.ObjectData, 36, rot.Length); | 3586 | Buffer.BlockCopy(rot, 0, objectData.ObjectData, 36, rot.Length); |
3657 | 3587 | ||
3658 | byte[] rvel = rotational_velocity.GetBytes(); | 3588 | byte[] rvel = data.rvel.GetBytes(); |
3659 | Array.Copy(rvel, 0, objectData.ObjectData, 36 + rot.Length, rvel.Length); | 3589 | Buffer.BlockCopy(rvel, 0, objectData.ObjectData, 36 + rot.Length, rvel.Length); |
3660 | 3590 | ||
3661 | if (textureanim.Length > 0) | 3591 | if (data.textureanim.Length > 0) |
3662 | { | 3592 | { |
3663 | objectData.TextureAnim = textureanim; | 3593 | objectData.TextureAnim = data.textureanim; |
3664 | } | 3594 | } |
3665 | 3595 | ||
3666 | lock (m_primFullUpdates_.SyncRoot) | 3596 | lock (m_primFullUpdates.SyncRoot) |
3667 | { | 3597 | m_primFullUpdates.Enqueue(data.priority, objectData, data.localID); |
3668 | if (m_primFullUpdates_.Count == 0) | ||
3669 | m_primFullUpdateTimer.Start(); | ||
3670 | |||
3671 | m_primFullUpdates_.Enqueue(DateTime.Now.ToOADate(), objectData, localID); | ||
3672 | |||
3673 | if (m_primFullUpdates_.Count >= m_primFullUpdatesPerPacket) | ||
3674 | ProcessPrimFullUpdates(this, null); | ||
3675 | } | ||
3676 | } | 3598 | } |
3677 | 3599 | ||
3678 | void HandleQueueEmpty(ThrottleOutPacketType queue) | 3600 | void HandleQueueEmpty(ThrottleOutPacketType queue) |
@@ -3682,6 +3604,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3682 | case ThrottleOutPacketType.Texture: | 3604 | case ThrottleOutPacketType.Texture: |
3683 | ProcessTextureRequests(); | 3605 | ProcessTextureRequests(); |
3684 | break; | 3606 | break; |
3607 | case ThrottleOutPacketType.State: | ||
3608 | int count = 0; | ||
3609 | |||
3610 | lock (m_avatarTerseUpdates.SyncRoot) | ||
3611 | count = m_avatarTerseUpdates.Count; | ||
3612 | if (count > 0) | ||
3613 | { | ||
3614 | ProcessAvatarTerseUpdates(); | ||
3615 | return; | ||
3616 | } | ||
3617 | |||
3618 | lock (m_primFullUpdates.SyncRoot) | ||
3619 | count = m_primFullUpdates.Count; | ||
3620 | if (count > 0) | ||
3621 | { | ||
3622 | ProcessPrimFullUpdates(); | ||
3623 | return; | ||
3624 | } | ||
3625 | |||
3626 | lock (m_primTerseUpdates.SyncRoot) | ||
3627 | count = m_primTerseUpdates.Count; | ||
3628 | if (count > 0) | ||
3629 | { | ||
3630 | ProcessPrimTerseUpdates(); | ||
3631 | return; | ||
3632 | } | ||
3633 | break; | ||
3685 | } | 3634 | } |
3686 | } | 3635 | } |
3687 | 3636 | ||
@@ -3691,18 +3640,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3691 | m_imageManager.ProcessImageQueue(m_textureSendLimit); | 3640 | m_imageManager.ProcessImageQueue(m_textureSendLimit); |
3692 | } | 3641 | } |
3693 | 3642 | ||
3694 | void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e) | 3643 | void ProcessPrimFullUpdates() |
3695 | { | 3644 | { |
3696 | lock (m_primFullUpdates_.SyncRoot) | 3645 | lock (m_primFullUpdates.SyncRoot) |
3697 | { | 3646 | { |
3698 | if (m_primFullUpdates_.Count == 0 && m_primFullUpdateTimer.Enabled) | ||
3699 | { | ||
3700 | lock (m_primFullUpdateTimer) | ||
3701 | m_primFullUpdateTimer.Stop(); | ||
3702 | |||
3703 | return; | ||
3704 | } | ||
3705 | |||
3706 | ObjectUpdatePacket outPacket = | 3647 | ObjectUpdatePacket outPacket = |
3707 | (ObjectUpdatePacket)PacketPool.Instance.GetPacket( | 3648 | (ObjectUpdatePacket)PacketPool.Instance.GetPacket( |
3708 | PacketType.ObjectUpdate); | 3649 | PacketType.ObjectUpdate); |
@@ -3712,7 +3653,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3712 | outPacket.RegionData.TimeDilation = | 3653 | outPacket.RegionData.TimeDilation = |
3713 | (ushort)(Scene.TimeDilation * ushort.MaxValue); | 3654 | (ushort)(Scene.TimeDilation * ushort.MaxValue); |
3714 | 3655 | ||
3715 | int max = m_primFullUpdates_.Count; | 3656 | int max = m_primFullUpdates.Count; |
3716 | if (max > m_primFullUpdatesPerPacket) | 3657 | if (max > m_primFullUpdatesPerPacket) |
3717 | max = m_primFullUpdatesPerPacket; | 3658 | max = m_primFullUpdatesPerPacket; |
3718 | 3659 | ||
@@ -3727,12 +3668,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3727 | for (count = 0 ; count < max ; count++) | 3668 | for (count = 0 ; count < max ; count++) |
3728 | { | 3669 | { |
3729 | int length = 0; | 3670 | int length = 0; |
3730 | m_primFullUpdates_.Peek().ToBytes(blockbuffer, ref length); | 3671 | m_primFullUpdates.Peek().ToBytes(blockbuffer, ref length); |
3731 | length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer); | 3672 | length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer); |
3732 | if (size + length > Packet.MTU) | 3673 | if (size + length > Packet.MTU) |
3733 | break; | 3674 | break; |
3734 | size += length; | 3675 | size += length; |
3735 | updates.Enqueue(m_primFullUpdates_.Dequeue()); | 3676 | updates.Enqueue(m_primFullUpdates.Dequeue()); |
3736 | } | 3677 | } |
3737 | 3678 | ||
3738 | outPacket.ObjectData = | 3679 | outPacket.ObjectData = |
@@ -3743,53 +3684,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3743 | 3684 | ||
3744 | outPacket.Header.Zerocoded = true; | 3685 | outPacket.Header.Zerocoded = true; |
3745 | OutPacket(outPacket, ThrottleOutPacketType.State); | 3686 | OutPacket(outPacket, ThrottleOutPacketType.State); |
3746 | |||
3747 | if (m_primFullUpdates_.Count == 0 && m_primFullUpdateTimer.Enabled) | ||
3748 | lock (m_primFullUpdateTimer) | ||
3749 | m_primFullUpdateTimer.Stop(); | ||
3750 | } | 3687 | } |
3751 | } | 3688 | } |
3752 | 3689 | ||
3753 | /// <summary> | 3690 | /// <summary> |
3754 | /// | 3691 | /// |
3755 | /// </summary> | 3692 | /// </summary> |
3756 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, | 3693 | //public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, |
3757 | Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID ownerID, int attachPoint) | 3694 | // Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID ownerID, int attachPoint) |
3695 | public void SendPrimTerseUpdate(SendPrimitiveTerseData data) | ||
3758 | { | 3696 | { |
3759 | if (attachPoint > 30 && ownerID != AgentId) // Someone else's HUD | 3697 | if (data.priority == double.NaN) |
3698 | { | ||
3699 | m_log.Error("[LLClientView] SendPrimTerseUpdate received a NaN priority, dropping update"); | ||
3700 | return; | ||
3701 | } | ||
3702 | |||
3703 | Quaternion rotation = data.rotation; | ||
3704 | |||
3705 | if (data.attachPoint > 30 && data.owner != AgentId) // Someone else's HUD | ||
3760 | return; | 3706 | return; |
3761 | 3707 | ||
3762 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) | 3708 | if (rotation.X == rotation.Y && rotation.Y == rotation.Z && rotation.Z == rotation.W && rotation.W == 0) |
3763 | rotation = Quaternion.Identity; | 3709 | rotation = Quaternion.Identity; |
3764 | 3710 | ||
3765 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock objectData = | 3711 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock objectData = |
3766 | CreatePrimImprovedBlock(localID, position, rotation, | 3712 | CreatePrimImprovedBlock(data.localID, data.position, rotation, |
3767 | velocity, rotationalvelocity, state); | 3713 | data.velocity, data.rotationalvelocity, data.state); |
3768 | |||
3769 | lock (m_primTerseUpdates_.SyncRoot) | ||
3770 | { | ||
3771 | if (m_primTerseUpdates_.Count == 0) | ||
3772 | m_primTerseUpdateTimer.Start(); | ||
3773 | |||
3774 | m_primTerseUpdates_.Enqueue(DateTime.Now.ToOADate(), objectData, localID); | ||
3775 | 3714 | ||
3776 | if (m_primTerseUpdates_.Count >= m_primTerseUpdatesPerPacket) | 3715 | lock (m_primTerseUpdates.SyncRoot) |
3777 | ProcessPrimTerseUpdates(this, null); | 3716 | m_primTerseUpdates.Enqueue(data.priority, objectData, data.localID); |
3778 | } | ||
3779 | } | 3717 | } |
3780 | 3718 | ||
3781 | void ProcessPrimTerseUpdates(object sender, ElapsedEventArgs e) | 3719 | void ProcessPrimTerseUpdates() |
3782 | { | 3720 | { |
3783 | lock (m_primTerseUpdates_.SyncRoot) | 3721 | lock (m_primTerseUpdates.SyncRoot) |
3784 | { | 3722 | { |
3785 | if (m_primTerseUpdates_.Count == 0) | ||
3786 | { | ||
3787 | lock (m_primTerseUpdateTimer) | ||
3788 | m_primTerseUpdateTimer.Stop(); | ||
3789 | |||
3790 | return; | ||
3791 | } | ||
3792 | |||
3793 | ImprovedTerseObjectUpdatePacket outPacket = | 3723 | ImprovedTerseObjectUpdatePacket outPacket = |
3794 | (ImprovedTerseObjectUpdatePacket) | 3724 | (ImprovedTerseObjectUpdatePacket) |
3795 | PacketPool.Instance.GetPacket( | 3725 | PacketPool.Instance.GetPacket( |
@@ -3800,7 +3730,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3800 | outPacket.RegionData.TimeDilation = | 3730 | outPacket.RegionData.TimeDilation = |
3801 | (ushort)(Scene.TimeDilation * ushort.MaxValue); | 3731 | (ushort)(Scene.TimeDilation * ushort.MaxValue); |
3802 | 3732 | ||
3803 | int max = m_primTerseUpdates_.Count; | 3733 | int max = m_primTerseUpdates.Count; |
3804 | if (max > m_primTerseUpdatesPerPacket) | 3734 | if (max > m_primTerseUpdatesPerPacket) |
3805 | max = m_primTerseUpdatesPerPacket; | 3735 | max = m_primTerseUpdatesPerPacket; |
3806 | 3736 | ||
@@ -3815,12 +3745,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3815 | for (count = 0 ; count < max ; count++) | 3745 | for (count = 0 ; count < max ; count++) |
3816 | { | 3746 | { |
3817 | int length = 0; | 3747 | int length = 0; |
3818 | m_primTerseUpdates_.Peek().ToBytes(blockbuffer, ref length); | 3748 | m_primTerseUpdates.Peek().ToBytes(blockbuffer, ref length); |
3819 | length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer); | 3749 | length = Helpers.ZeroEncode(blockbuffer, length, zerobuffer); |
3820 | if (size + length > Packet.MTU) | 3750 | if (size + length > Packet.MTU) |
3821 | break; | 3751 | break; |
3822 | size += length; | 3752 | size += length; |
3823 | updates.Enqueue(m_primTerseUpdates_.Dequeue()); | 3753 | updates.Enqueue(m_primTerseUpdates.Dequeue()); |
3824 | } | 3754 | } |
3825 | 3755 | ||
3826 | outPacket.ObjectData = | 3756 | outPacket.ObjectData = |
@@ -3833,26 +3763,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3833 | outPacket.Header.Reliable = false; | 3763 | outPacket.Header.Reliable = false; |
3834 | outPacket.Header.Zerocoded = true; | 3764 | outPacket.Header.Zerocoded = true; |
3835 | OutPacket(outPacket, ThrottleOutPacketType.State); | 3765 | OutPacket(outPacket, ThrottleOutPacketType.State); |
3836 | |||
3837 | if (m_primTerseUpdates_.Count == 0) | ||
3838 | lock (m_primTerseUpdateTimer) | ||
3839 | m_primTerseUpdateTimer.Stop(); | ||
3840 | } | 3766 | } |
3841 | } | 3767 | } |
3842 | 3768 | ||
3843 | public void FlushPrimUpdates() | 3769 | public void FlushPrimUpdates() |
3844 | { | 3770 | { |
3845 | while (m_primFullUpdates_.Count > 0) | 3771 | while (m_primFullUpdates.Count > 0) |
3846 | { | 3772 | { |
3847 | ProcessPrimFullUpdates(this, null); | 3773 | ProcessPrimFullUpdates(); |
3848 | } | 3774 | } |
3849 | while (m_primTerseUpdates_.Count > 0) | 3775 | while (m_primTerseUpdates.Count > 0) |
3850 | { | 3776 | { |
3851 | ProcessPrimTerseUpdates(this, null); | 3777 | ProcessPrimTerseUpdates(); |
3852 | } | 3778 | } |
3853 | while (m_avatarTerseUpdates_.Count > 0) | 3779 | while (m_avatarTerseUpdates.Count > 0) |
3854 | { | 3780 | { |
3855 | ProcessAvatarTerseUpdates(this, null); | 3781 | ProcessAvatarTerseUpdates(); |
3856 | } | 3782 | } |
3857 | } | 3783 | } |
3858 | 3784 | ||
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index d651fd4..3799a02 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -499,13 +499,11 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
499 | { | 499 | { |
500 | } | 500 | } |
501 | 501 | ||
502 | public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, | 502 | public virtual void SendAvatarData(SendAvatarData data) |
503 | uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) | ||
504 | { | 503 | { |
505 | } | 504 | } |
506 | 505 | ||
507 | public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | 506 | public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data) |
508 | Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentid) | ||
509 | { | 507 | { |
510 | } | 508 | } |
511 | 509 | ||
@@ -521,27 +519,11 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
521 | { | 519 | { |
522 | } | 520 | } |
523 | 521 | ||
524 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 522 | public virtual void SendPrimitiveToClient(SendPrimitiveData data) |
525 | PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, | ||
526 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, | ||
527 | UUID objectID, UUID ownerID, string text, byte[] color, | ||
528 | uint parentID, | ||
529 | byte[] particleSystem, byte clickAction, byte material) | ||
530 | { | 523 | { |
531 | } | 524 | } |
532 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 525 | |
533 | PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, | 526 | public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data) |
534 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, | ||
535 | UUID objectID, UUID ownerID, string text, byte[] color, | ||
536 | uint parentID, | ||
537 | byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation, | ||
538 | bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | ||
539 | { | ||
540 | } | ||
541 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | ||
542 | Vector3 position, Quaternion rotation, Vector3 velocity, | ||
543 | Vector3 rotationalvelocity, byte state, UUID AssetId, | ||
544 | UUID ownerID, int attachPoint) | ||
545 | { | 527 | { |
546 | } | 528 | } |
547 | 529 | ||
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs index 8e3f4a0..7251d57 100644 --- a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs +++ b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs | |||
@@ -34,7 +34,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
34 | { | 34 | { |
35 | void Reset(); | 35 | void Reset(); |
36 | void Close(); | 36 | void Close(); |
37 | int MaxPrimsPerFrame { get; set; } | ||
38 | void QueuePartForUpdate(SceneObjectPart part); | 37 | void QueuePartForUpdate(SceneObjectPart part); |
39 | void SendPrimUpdates(); | 38 | void SendPrimUpdates(); |
40 | } | 39 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d13d4fb..c7efc19 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -57,6 +57,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
57 | 57 | ||
58 | public partial class Scene : SceneBase | 58 | public partial class Scene : SceneBase |
59 | { | 59 | { |
60 | public enum UpdatePrioritizationSchemes { | ||
61 | Time = 0, | ||
62 | Distance = 1, | ||
63 | SimpleAngularDistance = 2, | ||
64 | } | ||
65 | |||
60 | public delegate void SynchronizeSceneHandler(Scene scene); | 66 | public delegate void SynchronizeSceneHandler(Scene scene); |
61 | public SynchronizeSceneHandler SynchronizeScene = null; | 67 | public SynchronizeSceneHandler SynchronizeScene = null; |
62 | 68 | ||
@@ -268,9 +274,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
268 | private volatile bool shuttingdown = false; | 274 | private volatile bool shuttingdown = false; |
269 | 275 | ||
270 | private int m_lastUpdate = Environment.TickCount; | 276 | private int m_lastUpdate = Environment.TickCount; |
271 | private int m_maxPrimsPerFrame = 200; | ||
272 | private bool m_firstHeartbeat = true; | 277 | private bool m_firstHeartbeat = true; |
273 | 278 | ||
279 | private UpdatePrioritizationSchemes m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time; | ||
280 | |||
274 | private object m_deleting_scene_object = new object(); | 281 | private object m_deleting_scene_object = new object(); |
275 | 282 | ||
276 | // the minimum time that must elapse before a changed object will be considered for persisted | 283 | // the minimum time that must elapse before a changed object will be considered for persisted |
@@ -282,6 +289,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
282 | 289 | ||
283 | #region Properties | 290 | #region Properties |
284 | 291 | ||
292 | public UpdatePrioritizationSchemes UpdatePrioritizationScheme { get { return this.m_update_prioritization_scheme; } } | ||
293 | |||
285 | public AgentCircuitManager AuthenticateHandler | 294 | public AgentCircuitManager AuthenticateHandler |
286 | { | 295 | { |
287 | get { return m_authenticateHandler; } | 296 | get { return m_authenticateHandler; } |
@@ -326,12 +335,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
326 | get { return m_sceneGraph.m_syncRoot; } | 335 | get { return m_sceneGraph.m_syncRoot; } |
327 | } | 336 | } |
328 | 337 | ||
329 | public int MaxPrimsPerFrame | ||
330 | { | ||
331 | get { return m_maxPrimsPerFrame; } | ||
332 | set { m_maxPrimsPerFrame = value; } | ||
333 | } | ||
334 | |||
335 | /// <summary> | 338 | /// <summary> |
336 | /// This is for llGetRegionFPS | 339 | /// This is for llGetRegionFPS |
337 | /// </summary> | 340 | /// </summary> |
@@ -509,7 +512,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
509 | 512 | ||
510 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); | 513 | m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "DotNetEngine"); |
511 | 514 | ||
512 | m_maxPrimsPerFrame = startupConfig.GetInt("MaxPrimsPerFrame", 200); | ||
513 | IConfig packetConfig = m_config.Configs["PacketPool"]; | 515 | IConfig packetConfig = m_config.Configs["PacketPool"]; |
514 | if (packetConfig != null) | 516 | if (packetConfig != null) |
515 | { | 517 | { |
@@ -518,6 +520,28 @@ namespace OpenSim.Region.Framework.Scenes | |||
518 | } | 520 | } |
519 | 521 | ||
520 | m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); | 522 | m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl); |
523 | |||
524 | IConfig interest_management_config = m_config.Configs["InterestManagement"]; | ||
525 | if (interest_management_config != null) | ||
526 | { | ||
527 | string update_prioritization_scheme = interest_management_config.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower(); | ||
528 | switch (update_prioritization_scheme) | ||
529 | { | ||
530 | case "time": | ||
531 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time; | ||
532 | break; | ||
533 | case "distance": | ||
534 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.Distance; | ||
535 | break; | ||
536 | case "simpleangulardistance": | ||
537 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.SimpleAngularDistance; | ||
538 | break; | ||
539 | default: | ||
540 | m_log.Warn("[SCENE]: UpdatePrioritizationScheme was not recognized, setting to default settomg of Time"); | ||
541 | m_update_prioritization_scheme = UpdatePrioritizationSchemes.Time; | ||
542 | break; | ||
543 | } | ||
544 | } | ||
521 | } | 545 | } |
522 | catch | 546 | catch |
523 | { | 547 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 04397ad..b9872ca 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -613,7 +613,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
613 | 613 | ||
614 | newAvatar = new ScenePresence(client, m_parentScene, m_regInfo, appearance); | 614 | newAvatar = new ScenePresence(client, m_parentScene, m_regInfo, appearance); |
615 | newAvatar.IsChildAgent = true; | 615 | newAvatar.IsChildAgent = true; |
616 | newAvatar.MaxPrimsPerFrame = m_parentScene.MaxPrimsPerFrame; | ||
617 | 616 | ||
618 | AddScenePresence(newAvatar); | 617 | AddScenePresence(newAvatar); |
619 | 618 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index d4cef7d..2153b9b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1817 | public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags) | 1817 | public void ServiceObjectPropertiesFamilyRequest(IClientAPI remoteClient, UUID AgentID, uint RequestFlags) |
1818 | { | 1818 | { |
1819 | 1819 | ||
1820 | remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.ObjectOwner, RootPart.GroupID, RootPart.BaseMask, | 1820 | remoteClient.SendObjectPropertiesFamilyData(RequestFlags, RootPart.UUID, RootPart.OwnerID, RootPart.GroupID, RootPart.BaseMask, |
1821 | RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask, | 1821 | RootPart.OwnerMask, RootPart.GroupMask, RootPart.EveryoneMask, RootPart.NextOwnerMask, |
1822 | RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category, | 1822 | RootPart.OwnershipCost, RootPart.ObjectSaleType, RootPart.SalePrice, RootPart.Category, |
1823 | RootPart.CreatorID, RootPart.Name, RootPart.Description); | 1823 | RootPart.CreatorID, RootPart.Name, RootPart.Description); |
@@ -3343,5 +3343,77 @@ namespace OpenSim.Region.Framework.Scenes | |||
3343 | 3343 | ||
3344 | return true; | 3344 | return true; |
3345 | } | 3345 | } |
3346 | |||
3347 | public double GetUpdatePriority(IClientAPI client) | ||
3348 | { | ||
3349 | switch (Scene.UpdatePrioritizationScheme) | ||
3350 | { | ||
3351 | case Scene.UpdatePrioritizationSchemes.Time: | ||
3352 | return GetPriorityByTime(); | ||
3353 | case Scene.UpdatePrioritizationSchemes.Distance: | ||
3354 | return GetPriorityByDistance(client); | ||
3355 | case Scene.UpdatePrioritizationSchemes.SimpleAngularDistance: | ||
3356 | return GetPriorityBySimpleAngularDistance(client); | ||
3357 | default: | ||
3358 | throw new InvalidOperationException("UpdatePrioritizationScheme not defined"); | ||
3359 | } | ||
3360 | } | ||
3361 | |||
3362 | private double GetPriorityByTime() | ||
3363 | { | ||
3364 | return DateTime.Now.ToOADate(); | ||
3365 | } | ||
3366 | |||
3367 | private double GetPriorityByDistance(IClientAPI client) | ||
3368 | { | ||
3369 | ScenePresence presence = Scene.GetScenePresence(client.AgentId); | ||
3370 | if (presence != null) | ||
3371 | { | ||
3372 | return GetPriorityByDistance((presence.IsChildAgent) ? | ||
3373 | presence.AbsolutePosition : presence.CameraPosition); | ||
3374 | } | ||
3375 | return double.NaN; | ||
3376 | } | ||
3377 | |||
3378 | private double GetPriorityBySimpleAngularDistance(IClientAPI client) | ||
3379 | { | ||
3380 | ScenePresence presence = Scene.GetScenePresence(client.AgentId); | ||
3381 | if (presence != null) | ||
3382 | { | ||
3383 | return GetPriorityBySimpleAngularDistance((presence.IsChildAgent) ? | ||
3384 | presence.AbsolutePosition : presence.CameraPosition); | ||
3385 | } | ||
3386 | return double.NaN; | ||
3387 | } | ||
3388 | |||
3389 | public double GetPriorityByDistance(Vector3 position) | ||
3390 | { | ||
3391 | return Vector3.Distance(AbsolutePosition, position); | ||
3392 | } | ||
3393 | |||
3394 | public double GetPriorityBySimpleAngularDistance(Vector3 position) | ||
3395 | { | ||
3396 | double distance = Vector3.Distance(position, AbsolutePosition); | ||
3397 | if (distance >= double.Epsilon) | ||
3398 | { | ||
3399 | float height; | ||
3400 | Vector3 box = GetAxisAlignedBoundingBox(out height); | ||
3401 | |||
3402 | double angle = box.X / distance; | ||
3403 | double max = angle; | ||
3404 | |||
3405 | angle = box.Y / distance; | ||
3406 | if (max < angle) | ||
3407 | max = angle; | ||
3408 | |||
3409 | angle = box.Z / distance; | ||
3410 | if (max < angle) | ||
3411 | max = angle; | ||
3412 | |||
3413 | return -max; | ||
3414 | } | ||
3415 | else | ||
3416 | return double.MinValue; | ||
3417 | } | ||
3346 | } | 3418 | } |
3347 | } | 3419 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 377cb6e..79f6366 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2400,10 +2400,10 @@ if (m_shape != null) { | |||
2400 | //isattachment = ParentGroup.RootPart.IsAttachment; | 2400 | //isattachment = ParentGroup.RootPart.IsAttachment; |
2401 | 2401 | ||
2402 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; | 2402 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; |
2403 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, | 2403 | remoteClient.SendPrimitiveToClient(new SendPrimitiveData(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, |
2404 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, | 2404 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, |
2405 | m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, | 2405 | m_text, color, _parentID, m_particleSystem, m_clickAction, (byte)m_material, m_TextureAnimation, IsAttachment, |
2406 | AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius); | 2406 | AttachmentPoint,FromItemID, Sound, SoundGain, SoundFlags, SoundRadius, ParentGroup.GetUpdatePriority(remoteClient))); |
2407 | } | 2407 | } |
2408 | 2408 | ||
2409 | /// <summary> | 2409 | /// <summary> |
@@ -3794,12 +3794,12 @@ if (m_shape != null) { | |||
3794 | 3794 | ||
3795 | // Causes this thread to dig into the Client Thread Data. | 3795 | // Causes this thread to dig into the Client Thread Data. |
3796 | // Remember your locking here! | 3796 | // Remember your locking here! |
3797 | remoteClient.SendPrimTerseUpdate(m_regionHandle, | 3797 | remoteClient.SendPrimTerseUpdate(new SendPrimitiveTerseData(m_regionHandle, |
3798 | (ushort)(m_parentGroup.GetTimeDilation() * | 3798 | (ushort)(m_parentGroup.GetTimeDilation() * |
3799 | (float)ushort.MaxValue), LocalId, lPos, | 3799 | (float)ushort.MaxValue), LocalId, lPos, |
3800 | RotationOffset, Velocity, | 3800 | RotationOffset, Velocity, |
3801 | RotationalVelocity, state, FromItemID, | 3801 | RotationalVelocity, state, FromItemID, |
3802 | OwnerID, (int)AttachmentPoint); | 3802 | OwnerID, (int)AttachmentPoint, ParentGroup.GetUpdatePriority(remoteClient))); |
3803 | } | 3803 | } |
3804 | 3804 | ||
3805 | public void AddScriptLPS(int count) | 3805 | public void AddScriptLPS(int count) |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 387db44..a5b88c6 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -403,12 +403,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
403 | set { m_parentPosition = value; } | 403 | set { m_parentPosition = value; } |
404 | } | 404 | } |
405 | 405 | ||
406 | public int MaxPrimsPerFrame | ||
407 | { | ||
408 | get { return m_sceneViewer.MaxPrimsPerFrame; } | ||
409 | set { m_sceneViewer.MaxPrimsPerFrame = value; } | ||
410 | } | ||
411 | |||
412 | /// <summary> | 406 | /// <summary> |
413 | /// Absolute position of this avatar in 'region cordinates' | 407 | /// Absolute position of this avatar in 'region cordinates' |
414 | /// </summary> | 408 | /// </summary> |
@@ -2457,8 +2451,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2457 | Vector3 pos = m_pos; | 2451 | Vector3 pos = m_pos; |
2458 | pos.Z -= m_appearance.HipOffset; | 2452 | pos.Z -= m_appearance.HipOffset; |
2459 | 2453 | ||
2460 | remoteClient.SendAvatarTerseUpdate(m_regionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), | 2454 | remoteClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_regionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, |
2461 | LocalId, pos, Velocity, m_bodyRot, m_uuid); | 2455 | pos, m_velocity, m_rotation, m_uuid, GetUpdatePriority(remoteClient))); |
2462 | 2456 | ||
2463 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); | 2457 | m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); |
2464 | m_scene.StatsReporter.AddAgentUpdates(1); | 2458 | m_scene.StatsReporter.AddAgentUpdates(1); |
@@ -2563,9 +2557,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2563 | Vector3 pos = m_pos; | 2557 | Vector3 pos = m_pos; |
2564 | pos.Z -= m_appearance.HipOffset; | 2558 | pos.Z -= m_appearance.HipOffset; |
2565 | 2559 | ||
2566 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, | 2560 | remoteAvatar.m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, |
2567 | LocalId, m_pos, m_appearance.Texture.GetBytes(), | 2561 | LocalId, m_pos, m_appearance.Texture.GetBytes(), |
2568 | m_parentID, rot); | 2562 | m_parentID, rot)); |
2569 | m_scene.StatsReporter.AddAgentUpdates(1); | 2563 | m_scene.StatsReporter.AddAgentUpdates(1); |
2570 | } | 2564 | } |
2571 | 2565 | ||
@@ -2634,8 +2628,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2634 | Vector3 pos = m_pos; | 2628 | Vector3 pos = m_pos; |
2635 | pos.Z -= m_appearance.HipOffset; | 2629 | pos.Z -= m_appearance.HipOffset; |
2636 | 2630 | ||
2637 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, | 2631 | m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, |
2638 | m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot); | 2632 | m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot)); |
2639 | 2633 | ||
2640 | if (!m_isChildAgent) | 2634 | if (!m_isChildAgent) |
2641 | { | 2635 | { |
@@ -2741,8 +2735,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2741 | } | 2735 | } |
2742 | 2736 | ||
2743 | Quaternion rot = m_bodyRot; | 2737 | Quaternion rot = m_bodyRot; |
2744 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, | 2738 | m_controllingClient.SendAvatarData(new SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, |
2745 | m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot); | 2739 | m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot)); |
2746 | 2740 | ||
2747 | } | 2741 | } |
2748 | 2742 | ||
@@ -3870,5 +3864,41 @@ namespace OpenSim.Region.Framework.Scenes | |||
3870 | } | 3864 | } |
3871 | } | 3865 | } |
3872 | } | 3866 | } |
3867 | |||
3868 | public double GetUpdatePriority(IClientAPI client) | ||
3869 | { | ||
3870 | switch (Scene.UpdatePrioritizationScheme) | ||
3871 | { | ||
3872 | case Scene.UpdatePrioritizationSchemes.Time: | ||
3873 | return GetPriorityByTime(); | ||
3874 | case Scene.UpdatePrioritizationSchemes.Distance: | ||
3875 | return GetPriorityByDistance(client); | ||
3876 | case Scene.UpdatePrioritizationSchemes.SimpleAngularDistance: | ||
3877 | return GetPriorityByDistance(client); | ||
3878 | default: | ||
3879 | throw new InvalidOperationException("UpdatePrioritizationScheme not defined."); | ||
3880 | } | ||
3881 | } | ||
3882 | |||
3883 | private double GetPriorityByTime() | ||
3884 | { | ||
3885 | return DateTime.Now.ToOADate(); | ||
3886 | } | ||
3887 | |||
3888 | private double GetPriorityByDistance(IClientAPI client) | ||
3889 | { | ||
3890 | ScenePresence presence = Scene.GetScenePresence(client.AgentId); | ||
3891 | if (presence != null) | ||
3892 | { | ||
3893 | return GetPriorityByDistance((presence.IsChildAgent) ? | ||
3894 | presence.AbsolutePosition : presence.CameraPosition); | ||
3895 | } | ||
3896 | return double.NaN; | ||
3897 | } | ||
3898 | |||
3899 | private double GetPriorityByDistance(Vector3 position) | ||
3900 | { | ||
3901 | return Vector3.Distance(AbsolutePosition, position); | ||
3902 | } | ||
3873 | } | 3903 | } |
3874 | } | 3904 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index 8ab0552..e4296ef 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
@@ -45,14 +45,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
45 | 45 | ||
46 | protected Dictionary<UUID, ScenePartUpdate> m_updateTimes = new Dictionary<UUID, ScenePartUpdate>(); | 46 | protected Dictionary<UUID, ScenePartUpdate> m_updateTimes = new Dictionary<UUID, ScenePartUpdate>(); |
47 | 47 | ||
48 | protected int m_maxPrimsPerFrame = 200; | ||
49 | |||
50 | public int MaxPrimsPerFrame | ||
51 | { | ||
52 | get { return m_maxPrimsPerFrame; } | ||
53 | set { m_maxPrimsPerFrame = value; } | ||
54 | } | ||
55 | |||
56 | public SceneViewer() | 48 | public SceneViewer() |
57 | { | 49 | { |
58 | } | 50 | } |
@@ -82,16 +74,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
82 | { | 74 | { |
83 | m_pendingObjects = new Queue<SceneObjectGroup>(); | 75 | m_pendingObjects = new Queue<SceneObjectGroup>(); |
84 | 76 | ||
85 | List<EntityBase> ents = new List<EntityBase>(m_presence.Scene.Entities); | 77 | foreach (EntityBase e in m_presence.Scene.Entities) |
86 | if (!m_presence.IsChildAgent) // Proximity sort makes no sense for | ||
87 | { // Child agents | ||
88 | ents.Sort(delegate(EntityBase a, EntityBase b) | ||
89 | { | ||
90 | return Vector3.Distance(m_presence.AbsolutePosition, a.AbsolutePosition).CompareTo(Vector3.Distance(m_presence.AbsolutePosition, b.AbsolutePosition)); | ||
91 | }); | ||
92 | } | ||
93 | |||
94 | foreach (EntityBase e in ents) | ||
95 | { | 78 | { |
96 | if (e is SceneObjectGroup) | 79 | if (e is SceneObjectGroup) |
97 | m_pendingObjects.Enqueue((SceneObjectGroup)e); | 80 | m_pendingObjects.Enqueue((SceneObjectGroup)e); |
@@ -99,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
99 | } | 82 | } |
100 | } | 83 | } |
101 | 84 | ||
102 | while (m_pendingObjects != null && m_pendingObjects.Count > 0 && m_partsUpdateQueue.Count < m_maxPrimsPerFrame) | 85 | while (m_pendingObjects != null && m_pendingObjects.Count > 0) |
103 | { | 86 | { |
104 | SceneObjectGroup g = m_pendingObjects.Dequeue(); | 87 | SceneObjectGroup g = m_pendingObjects.Dequeue(); |
105 | 88 | ||
@@ -183,8 +166,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
183 | m_presence.GenerateClientFlags(part.UUID)); | 166 | m_presence.GenerateClientFlags(part.UUID)); |
184 | } | 167 | } |
185 | } | 168 | } |
186 | |||
187 | m_presence.ControllingClient.FlushPrimUpdates(); | ||
188 | } | 169 | } |
189 | 170 | ||
190 | public void Reset() | 171 | public void Reset() |
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs index 29c4672..f3be028 100644 --- a/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs +++ b/OpenSim/Region/Framework/Scenes/Scripting/IScriptHost.cs | |||
@@ -35,8 +35,8 @@ namespace OpenSim.Region.Framework.Scenes.Scripting | |||
35 | string Description { get; set; } | 35 | string Description { get; set; } |
36 | 36 | ||
37 | UUID UUID { get; } | 37 | UUID UUID { get; } |
38 | UUID ObjectOwner { get; } | 38 | UUID OwnerID { get; } |
39 | UUID ObjectCreator { get; } | 39 | UUID CreatorID { get; } |
40 | Vector3 AbsolutePosition { get; } | 40 | Vector3 AbsolutePosition { get; } |
41 | 41 | ||
42 | string SitName { get; set; } | 42 | string SitName { get; set; } |
diff --git a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs index af18a98..d7198f0 100644 --- a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs +++ b/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs | |||
@@ -68,12 +68,12 @@ namespace OpenSim.Region.Framework.Scenes.Scripting | |||
68 | get { return UUID.Zero; } | 68 | get { return UUID.Zero; } |
69 | } | 69 | } |
70 | 70 | ||
71 | public UUID ObjectOwner | 71 | public UUID OwnerID |
72 | { | 72 | { |
73 | get { return UUID.Zero; } | 73 | get { return UUID.Zero; } |
74 | } | 74 | } |
75 | 75 | ||
76 | public UUID ObjectCreator | 76 | public UUID CreatorID |
77 | { | 77 | { |
78 | get { return UUID.Zero; } | 78 | get { return UUID.Zero; } |
79 | } | 79 | } |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index a8acf0d..8ad9327 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -1011,12 +1011,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1011 | 1011 | ||
1012 | } | 1012 | } |
1013 | 1013 | ||
1014 | public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) | 1014 | public void SendAvatarData(SendAvatarData data) |
1015 | { | 1015 | { |
1016 | 1016 | ||
1017 | } | 1017 | } |
1018 | 1018 | ||
1019 | public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentid) | 1019 | public void SendAvatarTerseUpdate(SendAvatarTerseData data) |
1020 | { | 1020 | { |
1021 | 1021 | ||
1022 | } | 1022 | } |
@@ -1036,17 +1036,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1036 | 1036 | ||
1037 | } | 1037 | } |
1038 | 1038 | ||
1039 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | 1039 | public void SendPrimitiveToClient(SendPrimitiveData data) |
1040 | { | 1040 | { |
1041 | 1041 | ||
1042 | } | 1042 | } |
1043 | 1043 | ||
1044 | public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material) | 1044 | public void SendPrimTerseUpdate(SendPrimitiveTerseData data) |
1045 | { | ||
1046 | |||
1047 | } | ||
1048 | |||
1049 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint) | ||
1050 | { | 1045 | { |
1051 | 1046 | ||
1052 | } | 1047 | } |
diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs index 0379180..e185351 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | |||
@@ -188,7 +188,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement | |||
188 | // MISC COMPARISONS (UUID, Byte) | 188 | // MISC COMPARISONS (UUID, Byte) |
189 | if (first.ClickAction != second.ClickAction) | 189 | if (first.ClickAction != second.ClickAction) |
190 | result |= Diff.CLICKACTION; | 190 | result |= Diff.CLICKACTION; |
191 | if (first.ObjectOwner != second.ObjectOwner) | 191 | if (first.OwnerID != second.OwnerID) |
192 | result |= Diff.OBJECTOWNER; | 192 | result |= Diff.OBJECTOWNER; |
193 | 193 | ||
194 | 194 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index f7c63ac..6c58f2d 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -588,13 +588,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
588 | { | 588 | { |
589 | } | 589 | } |
590 | 590 | ||
591 | public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, | 591 | public virtual void SendAvatarData(SendAvatarData data) |
592 | uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) | ||
593 | { | 592 | { |
594 | } | 593 | } |
595 | 594 | ||
596 | public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | 595 | public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data) |
597 | Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentId) | ||
598 | { | 596 | { |
599 | } | 597 | } |
600 | 598 | ||
@@ -610,26 +608,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
610 | { | 608 | { |
611 | } | 609 | } |
612 | 610 | ||
613 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 611 | public virtual void SendPrimitiveToClient(SendPrimitiveData data) |
614 | PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, | ||
615 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, | ||
616 | UUID objectID, UUID ownerID, string text, byte[] color, | ||
617 | uint parentID, | ||
618 | byte[] particleSystem, byte clickAction, byte material) | ||
619 | { | 612 | { |
620 | } | 613 | } |
621 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 614 | |
622 | PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, | 615 | public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data) |
623 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, | ||
624 | UUID objectID, UUID ownerID, string text, byte[] color, | ||
625 | uint parentID, | ||
626 | byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation, | ||
627 | bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | ||
628 | { | ||
629 | } | ||
630 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | ||
631 | Vector3 position, Quaternion rotation, Vector3 velocity, | ||
632 | Vector3 rotationalvelocity, byte state, UUID AssetId, UUID ownerID, int attachPoint) | ||
633 | { | 616 | { |
634 | } | 617 | } |
635 | 618 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e10e612..57b14f7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2875,7 +2875,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2875 | { | 2875 | { |
2876 | m_host.AddScriptLPS(1); | 2876 | m_host.AddScriptLPS(1); |
2877 | 2877 | ||
2878 | return m_host.ObjectOwner.ToString(); | 2878 | return m_host.OwnerID.ToString(); |
2879 | } | 2879 | } |
2880 | 2880 | ||
2881 | public void llInstantMessage(string user, string message) | 2881 | public void llInstantMessage(string user, string message) |
@@ -5634,7 +5634,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5634 | ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y); | 5634 | ILandObject parcel = World.LandChannel.GetLandObject(av.AbsolutePosition.X, av.AbsolutePosition.Y); |
5635 | if (parcel != null) | 5635 | if (parcel != null) |
5636 | { | 5636 | { |
5637 | if (m_host.ObjectOwner == parcel.LandData.OwnerID || | 5637 | if (m_host.OwnerID == parcel.LandData.OwnerID || |
5638 | (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.LandData.GroupID | 5638 | (m_host.OwnerID == m_host.GroupID && m_host.GroupID == parcel.LandData.GroupID |
5639 | && parcel.LandData.IsGroupOwned) || World.Permissions.IsGod(m_host.OwnerID)) | 5639 | && parcel.LandData.IsGroupOwned) || World.Permissions.IsGod(m_host.OwnerID)) |
5640 | { | 5640 | { |
@@ -7157,7 +7157,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7157 | 7157 | ||
7158 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 7158 | ILandObject land = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); |
7159 | 7159 | ||
7160 | if (land.LandData.OwnerID != m_host.ObjectOwner) | 7160 | if (land.LandData.OwnerID != m_host.OwnerID) |
7161 | return; | 7161 | return; |
7162 | 7162 | ||
7163 | land.SetMusicUrl(url); | 7163 | land.SetMusicUrl(url); |
@@ -7215,7 +7215,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7215 | public LSL_String llGetCreator() | 7215 | public LSL_String llGetCreator() |
7216 | { | 7216 | { |
7217 | m_host.AddScriptLPS(1); | 7217 | m_host.AddScriptLPS(1); |
7218 | return m_host.ObjectCreator.ToString(); | 7218 | return m_host.CreatorID.ToString(); |
7219 | } | 7219 | } |
7220 | 7220 | ||
7221 | public LSL_String llGetTimestamp() | 7221 | public LSL_String llGetTimestamp() |
@@ -8396,7 +8396,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8396 | IDialogModule dm = World.RequestModuleInterface<IDialogModule>(); | 8396 | IDialogModule dm = World.RequestModuleInterface<IDialogModule>(); |
8397 | if (null != dm) | 8397 | if (null != dm) |
8398 | dm.SendUrlToUser( | 8398 | dm.SendUrlToUser( |
8399 | new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.ObjectOwner, false, message, url); | 8399 | new UUID(avatar_id), m_host.Name, m_host.UUID, m_host.OwnerID, false, message, url); |
8400 | 8400 | ||
8401 | ConditionalScriptSleep(10000); | 8401 | ConditionalScriptSleep(10000); |
8402 | } | 8402 | } |
@@ -8411,7 +8411,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8411 | // according to the docs, this command only works if script owner and land owner are the same | 8411 | // according to the docs, this command only works if script owner and land owner are the same |
8412 | // lets add estate owners and gods, too, and use the generic permission check. | 8412 | // lets add estate owners and gods, too, and use the generic permission check. |
8413 | ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 8413 | ILandObject landObject = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); |
8414 | if (!World.Permissions.CanEditParcel(m_host.ObjectOwner, landObject)) return; | 8414 | if (!World.Permissions.CanEditParcel(m_host.OwnerID, landObject)) return; |
8415 | 8415 | ||
8416 | bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? | 8416 | bool update = false; // send a ParcelMediaUpdate (and possibly change the land's media URL)? |
8417 | byte loop = 0; | 8417 | byte loop = 0; |
@@ -9081,9 +9081,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9081 | Vector3 velocity = m_host.Velocity; | 9081 | Vector3 velocity = m_host.Velocity; |
9082 | Quaternion rotation = m_host.RotationOffset; | 9082 | Quaternion rotation = m_host.RotationOffset; |
9083 | string ownerName = String.Empty; | 9083 | string ownerName = String.Empty; |
9084 | ScenePresence scenePresence = World.GetScenePresence(m_host.ObjectOwner); | 9084 | ScenePresence scenePresence = World.GetScenePresence(m_host.OwnerID); |
9085 | if (scenePresence == null) | 9085 | if (scenePresence == null) |
9086 | ownerName = resolveName(m_host.ObjectOwner); | 9086 | ownerName = resolveName(m_host.OwnerID); |
9087 | else | 9087 | else |
9088 | ownerName = scenePresence.Name; | 9088 | ownerName = scenePresence.Name; |
9089 | 9089 | ||
@@ -9108,7 +9108,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9108 | httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z); | 9108 | httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z); |
9109 | httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W); | 9109 | httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W); |
9110 | httpHeaders["X-SecondLife-Owner-Name"] = ownerName; | 9110 | httpHeaders["X-SecondLife-Owner-Name"] = ownerName; |
9111 | httpHeaders["X-SecondLife-Owner-Key"] = m_host.ObjectOwner.ToString(); | 9111 | httpHeaders["X-SecondLife-Owner-Key"] = m_host.OwnerID.ToString(); |
9112 | string userAgent = config.Configs["Network"].GetString("user_agent", null); | 9112 | string userAgent = config.Configs["Network"].GetString("user_agent", null); |
9113 | if (userAgent != null) | 9113 | if (userAgent != null) |
9114 | httpHeaders["User-Agent"] = userAgent; | 9114 | httpHeaders["User-Agent"] = userAgent; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 4cb4b61..52396b6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1164,7 +1164,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1164 | ILandObject land | 1164 | ILandObject land |
1165 | = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 1165 | = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); |
1166 | 1166 | ||
1167 | if (land.LandData.OwnerID != m_host.ObjectOwner) | 1167 | if (land.LandData.OwnerID != m_host.OwnerID) |
1168 | return; | 1168 | return; |
1169 | 1169 | ||
1170 | land.SetMediaUrl(url); | 1170 | land.SetMediaUrl(url); |
@@ -1182,7 +1182,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1182 | ILandObject land | 1182 | ILandObject land |
1183 | = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); | 1183 | = World.LandChannel.GetLandObject(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y); |
1184 | 1184 | ||
1185 | if (land.LandData.OwnerID != m_host.ObjectOwner) | 1185 | if (land.LandData.OwnerID != m_host.OwnerID) |
1186 | { | 1186 | { |
1187 | OSSLError("osSetParcelSIPAddress: Sorry, you need to own the land to use this function"); | 1187 | OSSLError("osSetParcelSIPAddress: Sorry, you need to own the land to use this function"); |
1188 | return; | 1188 | return; |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 5c838c5..21606e2 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -592,13 +592,11 @@ namespace OpenSim.Tests.Common.Mock | |||
592 | { | 592 | { |
593 | } | 593 | } |
594 | 594 | ||
595 | public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, | 595 | public virtual void SendAvatarData(SendAvatarData data) |
596 | uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation) | ||
597 | { | 596 | { |
598 | } | 597 | } |
599 | 598 | ||
600 | public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | 599 | public virtual void SendAvatarTerseUpdate(SendAvatarTerseData data) |
601 | Vector3 position, Vector3 velocity, Quaternion rotation, UUID agentid) | ||
602 | { | 600 | { |
603 | } | 601 | } |
604 | 602 | ||
@@ -614,27 +612,11 @@ namespace OpenSim.Tests.Common.Mock | |||
614 | { | 612 | { |
615 | } | 613 | } |
616 | 614 | ||
617 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 615 | public virtual void SendPrimitiveToClient(SendPrimitiveData data) |
618 | PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, | ||
619 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, | ||
620 | UUID objectID, UUID ownerID, string text, byte[] color, | ||
621 | uint parentID, | ||
622 | byte[] particleSystem, byte clickAction, byte material) | ||
623 | { | 616 | { |
624 | } | 617 | } |
625 | public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, | 618 | |
626 | PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, | 619 | public virtual void SendPrimTerseUpdate(SendPrimitiveTerseData data) |
627 | Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, | ||
628 | UUID objectID, UUID ownerID, string text, byte[] color, | ||
629 | uint parentID, | ||
630 | byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation, | ||
631 | bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) | ||
632 | { | ||
633 | } | ||
634 | public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, | ||
635 | Vector3 position, Quaternion rotation, Vector3 velocity, | ||
636 | Vector3 rotationalvelocity, byte state, UUID AssetId, | ||
637 | UUID ownerID, int attachPoint) | ||
638 | { | 620 | { |
639 | } | 621 | } |
640 | 622 | ||