diff options
Diffstat (limited to 'OpenSim/Region')
-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 228ab6d..8cc5e25 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -9046,17 +9046,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9046 | int width = 0; | 9046 | int width = 0; |
9047 | int height = 0; | 9047 | int height = 0; |
9048 | 9048 | ||
9049 | ParcelMediaCommandEnum? commandToSend = null; | 9049 | uint commandToSend = 0; |
9050 | float time = 0.0f; // default is from start | 9050 | float time = 0.0f; // default is from start |
9051 | 9051 | ||
9052 | ScenePresence presence = null; | 9052 | ScenePresence presence = null; |
9053 | 9053 | ||
9054 | for (int i = 0; i < commandList.Data.Length; i++) | 9054 | for (int i = 0; i < commandList.Data.Length; i++) |
9055 | { | 9055 | { |
9056 | ParcelMediaCommandEnum command = (ParcelMediaCommandEnum)commandList.Data[i]; | 9056 | uint command = (uint)(commandList.GetLSLIntegerItem(i)); |
9057 | switch (command) | 9057 | switch (command) |
9058 | { | 9058 | { |
9059 | case ParcelMediaCommandEnum.Agent: | 9059 | case (uint)ParcelMediaCommandEnum.Agent: |
9060 | // we send only to one agent | 9060 | // we send only to one agent |
9061 | if ((i + 1) < commandList.Length) | 9061 | if ((i + 1) < commandList.Length) |
9062 | { | 9062 | { |
@@ -9073,25 +9073,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9073 | } | 9073 | } |
9074 | break; | 9074 | break; |
9075 | 9075 | ||
9076 | case ParcelMediaCommandEnum.Loop: | 9076 | case (uint)ParcelMediaCommandEnum.Loop: |
9077 | loop = 1; | 9077 | loop = 1; |
9078 | commandToSend = command; | 9078 | commandToSend = command; |
9079 | update = true; //need to send the media update packet to set looping | 9079 | update = true; //need to send the media update packet to set looping |
9080 | break; | 9080 | break; |
9081 | 9081 | ||
9082 | case ParcelMediaCommandEnum.Play: | 9082 | case (uint)ParcelMediaCommandEnum.Play: |
9083 | loop = 0; | 9083 | loop = 0; |
9084 | commandToSend = command; | 9084 | commandToSend = command; |
9085 | update = true; //need to send the media update packet to make sure it doesn't loop | 9085 | update = true; //need to send the media update packet to make sure it doesn't loop |
9086 | break; | 9086 | break; |
9087 | 9087 | ||
9088 | case ParcelMediaCommandEnum.Pause: | 9088 | case (uint)ParcelMediaCommandEnum.Pause: |
9089 | case ParcelMediaCommandEnum.Stop: | 9089 | case (uint)ParcelMediaCommandEnum.Stop: |
9090 | case ParcelMediaCommandEnum.Unload: | 9090 | case (uint)ParcelMediaCommandEnum.Unload: |
9091 | commandToSend = command; | 9091 | commandToSend = command; |
9092 | break; | 9092 | break; |
9093 | 9093 | ||
9094 | case ParcelMediaCommandEnum.Url: | 9094 | case (uint)ParcelMediaCommandEnum.Url: |
9095 | if ((i + 1) < commandList.Length) | 9095 | if ((i + 1) < commandList.Length) |
9096 | { | 9096 | { |
9097 | if (commandList.Data[i + 1] is LSL_String) | 9097 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9104,7 +9104,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9104 | } | 9104 | } |
9105 | break; | 9105 | break; |
9106 | 9106 | ||
9107 | case ParcelMediaCommandEnum.Texture: | 9107 | case (uint)ParcelMediaCommandEnum.Texture: |
9108 | if ((i + 1) < commandList.Length) | 9108 | if ((i + 1) < commandList.Length) |
9109 | { | 9109 | { |
9110 | if (commandList.Data[i + 1] is LSL_String) | 9110 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9117,7 +9117,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9117 | } | 9117 | } |
9118 | break; | 9118 | break; |
9119 | 9119 | ||
9120 | case ParcelMediaCommandEnum.Time: | 9120 | case (uint)ParcelMediaCommandEnum.Time: |
9121 | if ((i + 1) < commandList.Length) | 9121 | if ((i + 1) < commandList.Length) |
9122 | { | 9122 | { |
9123 | if (commandList.Data[i + 1] is LSL_Float) | 9123 | if (commandList.Data[i + 1] is LSL_Float) |
@@ -9129,7 +9129,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9129 | } | 9129 | } |
9130 | break; | 9130 | break; |
9131 | 9131 | ||
9132 | case ParcelMediaCommandEnum.AutoAlign: | 9132 | case (uint)ParcelMediaCommandEnum.AutoAlign: |
9133 | if ((i + 1) < commandList.Length) | 9133 | if ((i + 1) < commandList.Length) |
9134 | { | 9134 | { |
9135 | if (commandList.Data[i + 1] is LSL_Integer) | 9135 | if (commandList.Data[i + 1] is LSL_Integer) |
@@ -9143,7 +9143,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9143 | } | 9143 | } |
9144 | break; | 9144 | break; |
9145 | 9145 | ||
9146 | case ParcelMediaCommandEnum.Type: | 9146 | case (uint)ParcelMediaCommandEnum.Type: |
9147 | if ((i + 1) < commandList.Length) | 9147 | if ((i + 1) < commandList.Length) |
9148 | { | 9148 | { |
9149 | if (commandList.Data[i + 1] is LSL_String) | 9149 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9156,7 +9156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9156 | } | 9156 | } |
9157 | break; | 9157 | break; |
9158 | 9158 | ||
9159 | case ParcelMediaCommandEnum.Desc: | 9159 | case (uint)ParcelMediaCommandEnum.Desc: |
9160 | if ((i + 1) < commandList.Length) | 9160 | if ((i + 1) < commandList.Length) |
9161 | { | 9161 | { |
9162 | if (commandList.Data[i + 1] is LSL_String) | 9162 | if (commandList.Data[i + 1] is LSL_String) |
@@ -9169,7 +9169,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9169 | } | 9169 | } |
9170 | break; | 9170 | break; |
9171 | 9171 | ||
9172 | case ParcelMediaCommandEnum.Size: | 9172 | case (uint)ParcelMediaCommandEnum.Size: |
9173 | if ((i + 2) < commandList.Length) | 9173 | if ((i + 2) < commandList.Length) |
9174 | { | 9174 | { |
9175 | if (commandList.Data[i + 1] is LSL_Integer) | 9175 | if (commandList.Data[i + 1] is LSL_Integer) |
@@ -9239,7 +9239,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9239 | } | 9239 | } |
9240 | } | 9240 | } |
9241 | 9241 | ||
9242 | if (commandToSend != null) | 9242 | if (commandToSend != 0) |
9243 | { | 9243 | { |
9244 | // the commandList contained a start/stop/... command, too | 9244 | // the commandList contained a start/stop/... command, too |
9245 | if (presence == null) | 9245 | if (presence == null) |