From 7db2e19500963620e59d0a319088d69faf297ac0 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 9 Jul 2008 11:01:26 +0000
Subject: corrected the params types on IClientAPI.SendParcelMediaCommand. the
 command parameter should be set to the the ParcelMediaCommandEnum value.
 While flags seems to need to be set to (uint)(1<<[value of the command enum])

---
 OpenSim/Framework/IClientAPI.cs                           | 2 +-
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs      | 4 ++--
 OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 2 +-
 OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 8c9aee7..b969a8d 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 afae760..0e546db 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 e3aa169..10971db 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 0542c58..94983ee 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)
         {
 
         }
-- 
cgit v1.1