diff options
| author | Justin Clark-Casey (justincc) | 2010-08-30 21:24:08 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-30 21:24:08 +0100 |
| commit | dd14c539af0fdfb6a489f62860b94b9c6b5282fb (patch) | |
| tree | 48d1dd69f76d6ff69d5a51ecfc92cc84a642324c /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
| parent | Report exception message as well as stack trace if a region fails to register... (diff) | |
| parent | Fix a casting operation to use ToString() (diff) | |
| download | opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.zip opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.gz opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.bz2 opensim-SC_OLD-dd14c539af0fdfb6a489f62860b94b9c6b5282fb.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -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 af42dae..b51b410 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -9137,8 +9137,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 9137 | // we send to all | 9137 | // we send to all |
| 9138 | landData.MediaID = new UUID(texture); | 9138 | landData.MediaID = new UUID(texture); |
| 9139 | landData.MediaAutoScale = autoAlign ? (byte)1 : (byte)0; | 9139 | landData.MediaAutoScale = autoAlign ? (byte)1 : (byte)0; |
| 9140 | landData.MediaSize[0] = width; | 9140 | landData.MediaWidth = width; |
| 9141 | landData.MediaSize[1] = height; | 9141 | landData.MediaHeight = height; |
| 9142 | landData.MediaType = mediaType; | 9142 | landData.MediaType = mediaType; |
| 9143 | 9143 | ||
| 9144 | // do that one last, it will cause a ParcelPropertiesUpdate | 9144 | // do that one last, it will cause a ParcelPropertiesUpdate |
| @@ -9224,8 +9224,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 9224 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaType)); | 9224 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaType)); |
| 9225 | break; | 9225 | break; |
| 9226 | case ParcelMediaCommandEnum.Size: | 9226 | case ParcelMediaCommandEnum.Size: |
| 9227 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaSize[0])); | 9227 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaWidth)); |
| 9228 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaSize[1])); | 9228 | list.Add(new LSL_String(World.GetLandData(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y).MediaHeight)); |
| 9229 | break; | 9229 | break; |
| 9230 | default: | 9230 | default: |
| 9231 | ParcelMediaCommandEnum mediaCommandEnum = ParcelMediaCommandEnum.Url; | 9231 | ParcelMediaCommandEnum mediaCommandEnum = ParcelMediaCommandEnum.Url; |