aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712008-07-08 14:17:59 +0000
committerlbsa712008-07-08 14:17:59 +0000
commitb7fc172254794a23cba4cb1313c6951f55ed4b2a (patch)
treef7bed305d39b32780f7ad8c46de43d0d5a7c824d
parent* Changed casing of some archaic methods to conform with code standards (diff)
downloadopensim-SC_OLD-b7fc172254794a23cba4cb1313c6951f55ed4b2a.zip
opensim-SC_OLD-b7fc172254794a23cba4cb1313c6951f55ed4b2a.tar.gz
opensim-SC_OLD-b7fc172254794a23cba4cb1313c6951f55ed4b2a.tar.bz2
opensim-SC_OLD-b7fc172254794a23cba4cb1313c6951f55ed4b2a.tar.xz
* Added experimental SendParcelMediaCommand and SendParcelMediaUpdate to IClientAPI. These methods have not been tested, but feel free to start wiring them to llParcelMediaCommandList.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/IClientAPI.cs10
-rw-r--r--OpenSim/Framework/ParcelMediaCommandEnum.cs23
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs32
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs12
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs11
5 files changed, 87 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 6503d81..8c9aee7 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -640,6 +640,16 @@ namespace OpenSim.Framework
640 void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount); 640 void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount);
641 void SendLandParcelOverlay(byte[] data, int sequence_id); 641 void SendLandParcelOverlay(byte[] data, int sequence_id);
642 642
643 #region Parcel Methods
644
645 void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time);
646
647 void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID,
648 byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight,
649 byte mediaLoop);
650
651 #endregion
652
643 void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID); 653 void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID);
644 void SendConfirmXfer(ulong xferID, uint PacketID); 654 void SendConfirmXfer(ulong xferID, uint PacketID);
645 void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName); 655 void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName);
diff --git a/OpenSim/Framework/ParcelMediaCommandEnum.cs b/OpenSim/Framework/ParcelMediaCommandEnum.cs
new file mode 100644
index 0000000..e9a2cec
--- /dev/null
+++ b/OpenSim/Framework/ParcelMediaCommandEnum.cs
@@ -0,0 +1,23 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Framework
6{
7 public enum ParcelMediaCommandEnum
8 {
9 Stop = 0,
10 Pause = 1,
11 Play = 2,
12 Loop = 3,
13 Texture = 4,
14 Url = 5,
15 Time = 6,
16 Agent = 7,
17 Unload = 8,
18 AutoAlign = 9,
19 Type = 10,
20 Size = 11,
21 Desc = 12
22 }
23}
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 }