diff options
| author | Melanie Thielker | 2008-09-18 20:23:18 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-09-18 20:23:18 +0000 |
| commit | 48c2ef7e12fa6637e1ec2ee3a2f1844c06a9cbe0 (patch) | |
| tree | 741f900ca5efcb029cdd70c47abe384dc367c153 /OpenSim | |
| parent | Add a db.Dispose before calling Delete on the SQLite database. (diff) | |
| download | opensim-SC_OLD-48c2ef7e12fa6637e1ec2ee3a2f1844c06a9cbe0.zip opensim-SC_OLD-48c2ef7e12fa6637e1ec2ee3a2f1844c06a9cbe0.tar.gz opensim-SC_OLD-48c2ef7e12fa6637e1ec2ee3a2f1844c06a9cbe0.tar.bz2 opensim-SC_OLD-48c2ef7e12fa6637e1ec2ee3a2f1844c06a9cbe0.tar.xz | |
Fix llParcelMedia queries. Correct types and add a missing ToString() (XEngine)
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 1c108b7..758cf4b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -7294,13 +7294,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 7294 | switch ((ParcelMediaCommandEnum) aList.Data[i]) | 7294 | switch ((ParcelMediaCommandEnum) aList.Data[i]) |
| 7295 | { | 7295 | { |
| 7296 | case ParcelMediaCommandEnum.Url: | 7296 | case ParcelMediaCommandEnum.Url: |
| 7297 | list.Add(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL); | 7297 | list.Add(new LSL_Types.LSLString(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaURL)); |
| 7298 | break; | 7298 | break; |
| 7299 | case ParcelMediaCommandEnum.Desc: | 7299 | case ParcelMediaCommandEnum.Desc: |
| 7300 | list.Add(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).Description); | 7300 | list.Add(new LSL_Types.LSLString(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).Description)); |
| 7301 | break; | 7301 | break; |
| 7302 | case ParcelMediaCommandEnum.Texture: | 7302 | case ParcelMediaCommandEnum.Texture: |
| 7303 | list.Add(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaID); | 7303 | list.Add(new LSL_Types.LSLString(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaID.ToString())); |
| 7304 | break; | 7304 | break; |
| 7305 | default: | 7305 | default: |
| 7306 | ParcelMediaCommandEnum mediaCommandEnum = ParcelMediaCommandEnum.Url; | 7306 | ParcelMediaCommandEnum mediaCommandEnum = ParcelMediaCommandEnum.Url; |