diff options
author | Melanie | 2010-08-30 02:30:28 +0100 |
---|---|---|
committer | Melanie | 2010-08-30 02:30:28 +0100 |
commit | 79bfa275da6b8be03678bfa284bd205410296b6a (patch) | |
tree | 1ce2f9f2da9bb0e3a8f5628d54f44e45bfc33044 /OpenSim/Region/ScriptEngine | |
parent | Remove CRLF endings (diff) | |
parent | Fix a casting operation to use ToString() (diff) | |
download | opensim-SC_OLD-79bfa275da6b8be03678bfa284bd205410296b6a.zip opensim-SC_OLD-79bfa275da6b8be03678bfa284bd205410296b6a.tar.gz opensim-SC_OLD-79bfa275da6b8be03678bfa284bd205410296b6a.tar.bz2 opensim-SC_OLD-79bfa275da6b8be03678bfa284bd205410296b6a.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8381efa..512957d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -9611,8 +9611,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9611 | // we send to all | 9611 | // we send to all |
9612 | landData.MediaID = new UUID(texture); | 9612 | landData.MediaID = new UUID(texture); |
9613 | landData.MediaAutoScale = autoAlign ? (byte)1 : (byte)0; | 9613 | landData.MediaAutoScale = autoAlign ? (byte)1 : (byte)0; |
9614 | landData.MediaSize[0] = width; | 9614 | landData.MediaWidth = width; |
9615 | landData.MediaSize[1] = height; | 9615 | landData.MediaHeight = height; |
9616 | landData.MediaType = mediaType; | 9616 | landData.MediaType = mediaType; |
9617 | 9617 | ||
9618 | // do that one last, it will cause a ParcelPropertiesUpdate | 9618 | // do that one last, it will cause a ParcelPropertiesUpdate |
@@ -9698,8 +9698,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9698 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaType)); | 9698 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaType)); |
9699 | break; | 9699 | break; |
9700 | case ParcelMediaCommandEnum.Size: | 9700 | case ParcelMediaCommandEnum.Size: |
9701 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaSize[0])); | 9701 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaWidth)); |
9702 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaSize[1])); | 9702 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaHeight)); |
9703 | break; | 9703 | break; |
9704 | default: | 9704 | default: |
9705 | ParcelMediaCommandEnum mediaCommandEnum = ParcelMediaCommandEnum.Url; | 9705 | ParcelMediaCommandEnum mediaCommandEnum = ParcelMediaCommandEnum.Url; |