diff options
author | Tom Grimshaw | 2010-05-31 08:38:41 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-05-31 08:41:00 -0700 |
commit | 4be13b1a42f2899c6d2c985777a7501d59b0e4a5 (patch) | |
tree | 60b3ccc76cd80f8f7d292a9888da9c7547606143 /OpenSim | |
parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
download | opensim-SC-4be13b1a42f2899c6d2c985777a7501d59b0e4a5.zip opensim-SC-4be13b1a42f2899c6d2c985777a7501d59b0e4a5.tar.gz opensim-SC-4be13b1a42f2899c6d2c985777a7501d59b0e4a5.tar.bz2 opensim-SC-4be13b1a42f2899c6d2c985777a7501d59b0e4a5.tar.xz |
Fix casting in llParcelMediaCommandList so that it actually, you know, works
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 75dd615..8c7cc34 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -8925,17 +8925,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8925 | int width = 0; | 8925 | int width = 0; |
8926 | int height = 0; | 8926 | int height = 0; |
8927 | 8927 | ||
8928 | ParcelMediaCommandEnum? commandToSend = null; | 8928 | uint commandToSend = 0; |
8929 | float time = 0.0f; // default is from start | 8929 | float time = 0.0f; // default is from start |
8930 | 8930 | ||
8931 | ScenePresence presence = null; | 8931 | ScenePresence presence = null; |
8932 | 8932 | ||
8933 | for (int i = 0; i < commandList.Data.Length; i++) | 8933 | for (int i = 0; i < commandList.Data.Length; i++) |
8934 | { | 8934 | { |
8935 | ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; | 8935 | uint command = (uint)(commandList.GetLSLIntegerItem(i)); |
8936 | switch (command) | 8936 | switch (command) |
8937 | { | 8937 | { |
8938 | case ParcelMediaCommandEnum.Agent: | 8938 | case (uint)ParcelMediaCommandEnum.Agent: |
8939 | // we send only to one agent | 8939 | // we send only to one agent |
8940 | if ((i + 1) < commandList.Length) | 8940 | if ((i + 1) < commandList.Length) |
8941 | { | 8941 | { |
@@ -8952,25 +8952,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8952 | } | 8952 | } |
8953 | break; | 8953 | break; |
8954 | 8954 | ||
8955 | case ParcelMediaCommandEnum.Loop: | 8955 | case (uint)ParcelMediaCommandEnum.Loop: |
8956 | loop = 1; | 8956 | loop = 1; |
8957 | commandToSend = command; | 8957 | commandToSend = command; |
8958 | update = true; //need to send the media update packet to set looping | 8958 | update = true; //need to send the media update packet to set looping |
8959 | break; | 8959 | break; |
8960 | 8960 | ||
8961 | case ParcelMediaCommandEnum.Play: | 8961 | case (uint)ParcelMediaCommandEnum.Play: |
8962 | loop = 0; | 8962 | loop = 0; |
8963 | commandToSend = command; | 8963 | commandToSend = command; |
8964 | update = true; //need to send the media update packet to make sure it doesn't loop | 8964 | update = true; //need to send the media update packet to make sure it doesn't loop |
8965 | break; | 8965 | break; |
8966 | 8966 | ||
8967 | case ParcelMediaCommandEnum.Pause: | 8967 | case (uint)ParcelMediaCommandEnum.Pause: |
8968 | case ParcelMediaCommandEnum.Stop: | 8968 | case (uint)ParcelMediaCommandEnum.Stop: |
8969 | case ParcelMediaCommandEnum.Unload: | 8969 | case (uint)ParcelMediaCommandEnum.Unload: |
8970 | commandToSend = command; | 8970 | commandToSend = command; |
8971 | break; | 8971 | break; |
8972 | 8972 | ||
8973 | case ParcelMediaCommandEnum.Url: | 8973 | case (uint)ParcelMediaCommandEnum.Url: |
8974 | if ((i + 1) < commandList.Length) | 8974 | if ((i + 1) < commandList.Length) |
8975 | { | 8975 | { |
8976 | if (commandList.Data[i + 1] is LSL_String) | 8976 | if (commandList.Data[i + 1] is LSL_String) |
@@ -8983,7 +8983,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8983 | } | 8983 | } |
8984 | break; | 8984 | break; |
8985 | 8985 | ||
8986 | case ParcelMediaCommandEnum.Texture: | 8986 | case (uint)ParcelMediaCommandEnum.Texture: |
8987 | if ((i + 1) < commandList.Length) | 8987 | if ((i + 1) < commandList.Length) |
8988 | { | 8988 | { |
8989 | if (commandList.Data[i + 1] is LSL_String) | 8989 | if (commandList.Data[i + 1] is LSL_String) |
@@ -8996,7 +8996,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8996 | } | 8996 | } |
8997 | break; | 8997 | break; |
8998 | 8998 | ||
8999 | case ParcelMediaCommandEnum.Time: | 8999 | case (uint)ParcelMediaCommandEnum.Time: |
9000 | if ((i + 1) < commandList.Length) | 9000 | if ((i + 1) < commandList.Length) |
9001 | { | 9001 | { |
9002 | if (commandList.Data[i + 1] is LSL_Float) | 9002 | if (commandList.Data[i + 1] is LSL_Float) |
@@ -9008,7 +9008,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9008 | } | 9008 | } |
9009 | break; | 9009 | break; |
9010 | 9010 | ||
9011 | case ParcelMediaCommandEnum.AutoAlign: | 9011 | case (uint)ParcelMediaCommandEnum.AutoAlign: |
9012 | if ((i + 1) < commandList.Length) | 9012 | if ((i + 1) < commandList.Length) |
9013 | { | 9013 | { |
9014 | if (commandList.Data[i + 1] is LSL_Integer) | 9014 | if (commandList.Data[i + 1] is LSL_Integer) |
@@ -9022,7 +9022,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9022 | } | 9022 | } |
9023 | break; | 9023 | break; |
9024 | 9024 | ||
9025 | case ParcelMediaCommandEnum.Type: | 9025 | case (uint)ParcelMediaCommandEnum.Type: |
9026 | if ((i + 1) < commandList.Length) | 9026 | if ((i + 1) < commandList.Length) |
9027 | { | 9027 | { |
9028 | if (commandList.Data[i + 1] is LSL_String) | 9028 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9035,7 +9035,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9035 | } | 9035 | } |
9036 | break; | 9036 | break; |
9037 | 9037 | ||
9038 | case ParcelMediaCommandEnum.Desc: | 9038 | case (uint)ParcelMediaCommandEnum.Desc: |
9039 | if ((i + 1) < commandList.Length) | 9039 | if ((i + 1) < commandList.Length) |
9040 | { | 9040 | { |
9041 | if (commandList.Data[i + 1] is LSL_String) | 9041 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9048,7 +9048,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9048 | } | 9048 | } |
9049 | break; | 9049 | break; |
9050 | 9050 | ||
9051 | case ParcelMediaCommandEnum.Size: | 9051 | case (uint)ParcelMediaCommandEnum.Size: |
9052 | if ((i + 2) < commandList.Length) | 9052 | if ((i + 2) < commandList.Length) |
9053 | { | 9053 | { |
9054 | if (commandList.Data[i + 1] is LSL_Integer) | 9054 | if (commandList.Data[i + 1] is LSL_Integer) |
@@ -9116,7 +9116,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9116 | } | 9116 | } |
9117 | } | 9117 | } |
9118 | 9118 | ||
9119 | if (commandToSend != null) | 9119 | if (commandToSend != 0) |
9120 | { | 9120 | { |
9121 | // the commandList contained a start/stop/... command, too | 9121 | // the commandList contained a start/stop/... command, too |
9122 | if (presence == null) | 9122 | if (presence == null) |