aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2008-07-09 11:01:26 +0000
committerMW2008-07-09 11:01:26 +0000
commit7db2e19500963620e59d0a319088d69faf297ac0 (patch)
tree43b6e6bf7bffafa4abf3bb0ca21eb2cb58657977 /OpenSim/Region
parentPatch from Mike which removes a lexer warning in the LSL compiler. (diff)
downloadopensim-SC_OLD-7db2e19500963620e59d0a319088d69faf297ac0.zip
opensim-SC_OLD-7db2e19500963620e59d0a319088d69faf297ac0.tar.gz
opensim-SC_OLD-7db2e19500963620e59d0a319088d69faf297ac0.tar.bz2
opensim-SC_OLD-7db2e19500963620e59d0a319088d69faf297ac0.tar.xz
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])
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
3 files changed, 4 insertions, 4 deletions
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
6597 6597
6598 #region Media Parcel Members 6598 #region Media Parcel Members
6599 6599
6600 public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) 6600 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
6601 { 6601 {
6602 ParcelMediaCommandMessagePacket commandMessagePacket = new ParcelMediaCommandMessagePacket(); 6602 ParcelMediaCommandMessagePacket commandMessagePacket = new ParcelMediaCommandMessagePacket();
6603 commandMessagePacket.CommandBlock.Flags = (uint) flags; 6603 commandMessagePacket.CommandBlock.Flags = (uint) flags;
6604 commandMessagePacket.CommandBlock.Command = command; 6604 commandMessagePacket.CommandBlock.Command =(uint) command;
6605 commandMessagePacket.CommandBlock.Time = time; 6605 commandMessagePacket.CommandBlock.Time = time;
6606 6606
6607 OutPacket(commandMessagePacket, ThrottleOutPacketType.Unknown); 6607 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
796 #endregion 796 #endregion
797 797
798 798
799 public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) 799 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
800 { 800 {
801 } 801 }
802 802
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
771 { 771 {
772 } 772 }
773 773
774 public void SendParcelMediaCommand(ParcelMediaCommandEnum flags, uint command, float time) 774 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
775 { 775 {
776 776
777 } 777 }