diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 8c9aee77a1..b969a8d84b 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -642,7 +642,7 @@ namespace OpenSim.Framework #region Parcel Methods - void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time); + void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time); void SendParcelMediaUpdate(string mediaUrl, LLUUID mediaTextureID, byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index afae760701..0e546db34b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -6597,11 +6597,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP #region Media Parcel Members - public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) + public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) { ParcelMediaCommandMessagePacket commandMessagePacket = new ParcelMediaCommandMessagePacket(); commandMessagePacket.CommandBlock.Flags = (uint) flags; - commandMessagePacket.CommandBlock.Command = command; + commandMessagePacket.CommandBlock.Command =(uint) command; commandMessagePacket.CommandBlock.Time = time; OutPacket(commandMessagePacket, ThrottleOutPacketType.Unknown); diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index e3aa169673..10971db7ba 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs @@ -796,7 +796,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC #endregion - public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) + public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) { } diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 0542c58f12..94983ee4c9 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs @@ -771,7 +771,7 @@ namespace OpenSim.Region.Examples.SimpleModule { } - public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) + public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) { }