diff options
| author | Melanie Thielker | 2008-09-08 12:30:48 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-09-08 12:30:48 +0000 |
| commit | f2de15bffc40c13fade68d815a1e6da44c0cd977 (patch) | |
| tree | 1a3ae4292b582efdda884e9b34316326da25369a | |
| parent | Mantis #2145 (diff) | |
| download | opensim-SC_OLD-f2de15bffc40c13fade68d815a1e6da44c0cd977.zip opensim-SC_OLD-f2de15bffc40c13fade68d815a1e6da44c0cd977.tar.gz opensim-SC_OLD-f2de15bffc40c13fade68d815a1e6da44c0cd977.tar.bz2 opensim-SC_OLD-f2de15bffc40c13fade68d815a1e6da44c0cd977.tar.xz | |
Mantis #2144
Adjust XEngine llSetAlpha to a change in the underlying type
| -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 1159553..0cc8279 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1160,7 +1160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1160 | if (face > -1) | 1160 | if (face > -1) |
| 1161 | { | 1161 | { |
| 1162 | texcolor = tex.CreateFace((uint)face).RGBA; | 1162 | texcolor = tex.CreateFace((uint)face).RGBA; |
| 1163 | texcolor.A = (float)Math.Abs(alpha - 1); | 1163 | texcolor.A = (float)Math.Abs(alpha); |
| 1164 | tex.FaceTextures[face].RGBA = texcolor; | 1164 | tex.FaceTextures[face].RGBA = texcolor; |
| 1165 | part.UpdateTexture(tex); | 1165 | part.UpdateTexture(tex); |
| 1166 | return; | 1166 | return; |
| @@ -1172,12 +1172,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1172 | if (tex.FaceTextures[i] != null) | 1172 | if (tex.FaceTextures[i] != null) |
| 1173 | { | 1173 | { |
| 1174 | texcolor = tex.FaceTextures[i].RGBA; | 1174 | texcolor = tex.FaceTextures[i].RGBA; |
| 1175 | texcolor.A = (float)Math.Abs(alpha - 1); | 1175 | texcolor.A = (float)Math.Abs(alpha); |
| 1176 | tex.FaceTextures[i].RGBA = texcolor; | 1176 | tex.FaceTextures[i].RGBA = texcolor; |
| 1177 | } | 1177 | } |
| 1178 | } | 1178 | } |
| 1179 | texcolor = tex.DefaultTexture.RGBA; | 1179 | texcolor = tex.DefaultTexture.RGBA; |
| 1180 | texcolor.A = (float)Math.Abs(alpha - 1); | 1180 | texcolor.A = (float)Math.Abs(alpha); |
| 1181 | tex.DefaultTexture.RGBA = texcolor; | 1181 | tex.DefaultTexture.RGBA = texcolor; |
| 1182 | part.UpdateTexture(tex); | 1182 | part.UpdateTexture(tex); |
| 1183 | return; | 1183 | return; |