diff options
Diffstat (limited to '')
3 files changed, 54 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 7f21fc6..afae760 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -6594,5 +6594,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6594 | 6594 | ||
6595 | m_sequence = info.sequence; | 6595 | m_sequence = info.sequence; |
6596 | } | 6596 | } |
6597 | |||
6598 | #region Media Parcel Members | ||
6599 | |||
6600 | public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) | ||
6601 | { | ||
6602 | ParcelMediaCommandMessagePacket commandMessagePacket = new ParcelMediaCommandMessagePacket(); | ||
6603 | commandMessagePacket.CommandBlock.Flags = (uint) flags; | ||
6604 | commandMessagePacket.CommandBlock.Command = command; | ||
6605 | commandMessagePacket.CommandBlock.Time = time; | ||
6606 | |||
6607 | OutPacket(commandMessagePacket, ThrottleOutPacketType.Unknown); | ||
6608 | } | ||
6609 | |||
6610 | public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, | ||
6611 | byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, | ||
6612 | byte mediaLoop) | ||
6613 | { | ||
6614 | ParcelMediaUpdatePacket updatePacket = new ParcelMediaUpdatePacket(); | ||
6615 | updatePacket.DataBlock.MediaURL = Helpers.StringToField(mediaUrl); | ||
6616 | updatePacket.DataBlock.MediaID = mediaTextureID; | ||
6617 | updatePacket.DataBlock.MediaAutoScale = autoScale; | ||
6618 | |||
6619 | updatePacket.DataBlockExtended.MediaType = Helpers.StringToField(mediaType); | ||
6620 | updatePacket.DataBlockExtended.MediaDesc = Helpers.StringToField(mediaDesc); | ||
6621 | updatePacket.DataBlockExtended.MediaWidth = mediaWidth; | ||
6622 | updatePacket.DataBlockExtended.MediaWidth = mediaHeight; | ||
6623 | updatePacket.DataBlockExtended.MediaLoop = mediaLoop; | ||
6624 | |||
6625 | OutPacket(updatePacket, ThrottleOutPacketType.Unknown); | ||
6626 | } | ||
6627 | |||
6628 | #endregion | ||
6597 | } | 6629 | } |
6598 | } | 6630 | } |
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 4fc43d3..e3aa169 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -795,5 +795,15 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
795 | } | 795 | } |
796 | #endregion | 796 | #endregion |
797 | 797 | ||
798 | } | 798 | |
799 | public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) | ||
800 | { | ||
801 | } | ||
802 | |||
803 | public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, | ||
804 | byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, | ||
805 | byte mediaLoop) | ||
806 | { | ||
807 | } | ||
808 | } | ||
799 | } | 809 | } |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index a626f63..0542c58 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -771,6 +771,17 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
771 | { | 771 | { |
772 | } | 772 | } |
773 | 773 | ||
774 | public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) | ||
775 | { | ||
776 | |||
777 | } | ||
778 | |||
779 | public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, byte autoScale, string mediaType, | ||
780 | string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop) | ||
781 | { | ||
782 | |||
783 | } | ||
784 | |||
774 | public void SendGroupNameReply(LLUUID groupLLUID, string GroupName) | 785 | public void SendGroupNameReply(LLUUID groupLLUID, string GroupName) |
775 | { | 786 | { |
776 | } | 787 | } |