diff options
| author | Tom Grimshaw | 2010-07-01 09:47:18 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-01 09:47:18 -0700 |
| commit | 68281b356cea0ff92ae7d9484d663ea472d1be74 (patch) | |
| tree | 108b5d48164e195fce67321aa8afdeada146b19b /OpenSim/Region/ScriptEngine/Shared | |
| parent | Cache all assets on upload so that the client can still retrieve the asset if... (diff) | |
| parent | ANother stab at LSL compatibility (diff) | |
| download | opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.zip opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.gz opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.bz2 opensim-SC-68281b356cea0ff92ae7d9484d663ea472d1be74.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index d49bbb2..e226682 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -9394,7 +9394,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 9394 | 9394 | ||
| 9395 | if (aList.Data[i] != null) | 9395 | if (aList.Data[i] != null) |
| 9396 | { | 9396 | { |
| 9397 | switch ((ParcelMediaCommandEnum) aList.Data[i]) | 9397 | switch ((ParcelMediaCommandEnum) Convert.ToInt32(aList.Data[i].ToString())) |
| 9398 | { | 9398 | { |
| 9399 | case ParcelMediaCommandEnum.Url: | 9399 | case ParcelMediaCommandEnum.Url: |
| 9400 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); | 9400 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); |