* Added experimental SendParcelMediaCommand and SendParcelMediaUpdate to IClientAPI. These methods have not been tested, but feel free to start wiring them to llParcelMediaCommandList.
parent
6c13d68489
commit
b7fc172254
|
@ -640,6 +640,16 @@ namespace OpenSim.Framework
|
||||||
void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount);
|
void SendLandObjectOwners(Dictionary<LLUUID, int> ownersAndCount);
|
||||||
void SendLandParcelOverlay(byte[] data, int sequence_id);
|
void SendLandParcelOverlay(byte[] data, int sequence_id);
|
||||||
|
|
||||||
|
#region Parcel Methods
|
||||||
|
|
||||||
|
void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time);
|
||||||
|
|
||||||
|
void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID,
|
||||||
|
byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight,
|
||||||
|
byte mediaLoop);
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID);
|
void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, LLUUID AssetFullID);
|
||||||
void SendConfirmXfer(ulong xferID, uint PacketID);
|
void SendConfirmXfer(ulong xferID, uint PacketID);
|
||||||
void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName);
|
void SendXferRequest(ulong XferID, short AssetType, LLUUID vFileID, byte FilePath, byte[] FileName);
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace OpenSim.Framework
|
||||||
|
{
|
||||||
|
public enum ParcelMediaCommandEnum
|
||||||
|
{
|
||||||
|
Stop = 0,
|
||||||
|
Pause = 1,
|
||||||
|
Play = 2,
|
||||||
|
Loop = 3,
|
||||||
|
Texture = 4,
|
||||||
|
Url = 5,
|
||||||
|
Time = 6,
|
||||||
|
Agent = 7,
|
||||||
|
Unload = 8,
|
||||||
|
AutoAlign = 9,
|
||||||
|
Type = 10,
|
||||||
|
Size = 11,
|
||||||
|
Desc = 12
|
||||||
|
}
|
||||||
|
}
|
|
@ -6594,5 +6594,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
m_sequence = info.sequence;
|
m_sequence = info.sequence;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#region Media Parcel Members
|
||||||
|
|
||||||
|
public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time)
|
||||||
|
{
|
||||||
|
ParcelMediaCommandMessagePacket commandMessagePacket = new ParcelMediaCommandMessagePacket();
|
||||||
|
commandMessagePacket.CommandBlock.Flags = (uint) flags;
|
||||||
|
commandMessagePacket.CommandBlock.Command = command;
|
||||||
|
commandMessagePacket.CommandBlock.Time = time;
|
||||||
|
|
||||||
|
OutPacket(commandMessagePacket, ThrottleOutPacketType.Unknown);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID,
|
||||||
|
byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight,
|
||||||
|
byte mediaLoop)
|
||||||
|
{
|
||||||
|
ParcelMediaUpdatePacket updatePacket = new ParcelMediaUpdatePacket();
|
||||||
|
updatePacket.DataBlock.MediaURL = Helpers.StringToField(mediaUrl);
|
||||||
|
updatePacket.DataBlock.MediaID = mediaTextureID;
|
||||||
|
updatePacket.DataBlock.MediaAutoScale = autoScale;
|
||||||
|
|
||||||
|
updatePacket.DataBlockExtended.MediaType = Helpers.StringToField(mediaType);
|
||||||
|
updatePacket.DataBlockExtended.MediaDesc = Helpers.StringToField(mediaDesc);
|
||||||
|
updatePacket.DataBlockExtended.MediaWidth = mediaWidth;
|
||||||
|
updatePacket.DataBlockExtended.MediaWidth = mediaHeight;
|
||||||
|
updatePacket.DataBlockExtended.MediaLoop = mediaLoop;
|
||||||
|
|
||||||
|
OutPacket(updatePacket, ThrottleOutPacketType.Unknown);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -795,5 +795,15 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
|
||||||
|
public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID,
|
||||||
|
byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight,
|
||||||
|
byte mediaLoop)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -771,6 +771,17 @@ namespace OpenSim.Region.Examples.SimpleModule
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, byte autoScale, string mediaType,
|
||||||
|
string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public void SendGroupNameReply(LLUUID groupLLUID, string GroupName)
|
public void SendGroupNameReply(LLUUID groupLLUID, string GroupName)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue