aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2011-12-05 18:32:40 +0100
committerMelanie2011-12-05 18:32:40 +0100
commit2a8a46a32d49fa6629ae3c35365456e0625e3ba5 (patch)
tree4cf04b07c1cb5d692b9bf715fd4b0993dec444b0 /OpenSim/Region/ScriptEngine
parentStrip CR from http responses and limit them to 2048 chars (diff)
downloadopensim-SC-2a8a46a32d49fa6629ae3c35365456e0625e3ba5.zip
opensim-SC-2a8a46a32d49fa6629ae3c35365456e0625e3ba5.tar.gz
opensim-SC-2a8a46a32d49fa6629ae3c35365456e0625e3ba5.tar.bz2
opensim-SC-2a8a46a32d49fa6629ae3c35365456e0625e3ba5.tar.xz
Fix CHANGED_TEXTURE and CHANGED_COLOR.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs40
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e26aef3..ea99113 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1540,7 +1540,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1540 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f); 1540 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1541 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f); 1541 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1542 tex.FaceTextures[face].RGBA = texcolor; 1542 tex.FaceTextures[face].RGBA = texcolor;
1543 part.UpdateTexture(tex); 1543 part.UpdateTextureEntry(tex.GetBytes());
1544 return; 1544 return;
1545 } 1545 }
1546 else if (face == ScriptBaseClass.ALL_SIDES) 1546 else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1561,7 +1561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1561 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f); 1561 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1562 tex.DefaultTexture.RGBA = texcolor; 1562 tex.DefaultTexture.RGBA = texcolor;
1563 } 1563 }
1564 part.UpdateTexture(tex); 1564 part.UpdateTextureEntry(tex.GetBytes());
1565 return; 1565 return;
1566 } 1566 }
1567 1567
@@ -1586,7 +1586,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1586 { 1586 {
1587 tex.CreateFace((uint) face); 1587 tex.CreateFace((uint) face);
1588 tex.FaceTextures[face].TexMapType = textype; 1588 tex.FaceTextures[face].TexMapType = textype;
1589 part.UpdateTexture(tex); 1589 part.UpdateTextureEntry(tex.GetBytes());
1590 return; 1590 return;
1591 } 1591 }
1592 else if (face == ScriptBaseClass.ALL_SIDES) 1592 else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1599,7 +1599,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1599 } 1599 }
1600 tex.DefaultTexture.TexMapType = textype; 1600 tex.DefaultTexture.TexMapType = textype;
1601 } 1601 }
1602 part.UpdateTexture(tex); 1602 part.UpdateTextureEntry(tex.GetBytes());
1603 return; 1603 return;
1604 } 1604 }
1605 } 1605 }
@@ -1614,7 +1614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1614 { 1614 {
1615 tex.CreateFace((uint) face); 1615 tex.CreateFace((uint) face);
1616 tex.FaceTextures[face].Glow = glow; 1616 tex.FaceTextures[face].Glow = glow;
1617 part.UpdateTexture(tex); 1617 part.UpdateTextureEntry(tex.GetBytes());
1618 return; 1618 return;
1619 } 1619 }
1620 else if (face == ScriptBaseClass.ALL_SIDES) 1620 else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1627,7 +1627,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1627 } 1627 }
1628 tex.DefaultTexture.Glow = glow; 1628 tex.DefaultTexture.Glow = glow;
1629 } 1629 }
1630 part.UpdateTexture(tex); 1630 part.UpdateTextureEntry(tex.GetBytes());
1631 return; 1631 return;
1632 } 1632 }
1633 } 1633 }
@@ -1664,7 +1664,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1664 tex.CreateFace((uint) face); 1664 tex.CreateFace((uint) face);
1665 tex.FaceTextures[face].Shiny = sval; 1665 tex.FaceTextures[face].Shiny = sval;
1666 tex.FaceTextures[face].Bump = bump; 1666 tex.FaceTextures[face].Bump = bump;
1667 part.UpdateTexture(tex); 1667 part.UpdateTextureEntry(tex.GetBytes());
1668 return; 1668 return;
1669 } 1669 }
1670 else if (face == ScriptBaseClass.ALL_SIDES) 1670 else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1679,7 +1679,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1679 tex.DefaultTexture.Shiny = sval; 1679 tex.DefaultTexture.Shiny = sval;
1680 tex.DefaultTexture.Bump = bump; 1680 tex.DefaultTexture.Bump = bump;
1681 } 1681 }
1682 part.UpdateTexture(tex); 1682 part.UpdateTextureEntry(tex.GetBytes());
1683 return; 1683 return;
1684 } 1684 }
1685 } 1685 }
@@ -1694,7 +1694,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1694 { 1694 {
1695 tex.CreateFace((uint) face); 1695 tex.CreateFace((uint) face);
1696 tex.FaceTextures[face].Fullbright = bright; 1696 tex.FaceTextures[face].Fullbright = bright;
1697 part.UpdateTexture(tex); 1697 part.UpdateTextureEntry(tex.GetBytes());
1698 return; 1698 return;
1699 } 1699 }
1700 else if (face == ScriptBaseClass.ALL_SIDES) 1700 else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1707,7 +1707,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1707 } 1707 }
1708 } 1708 }
1709 tex.DefaultTexture.Fullbright = bright; 1709 tex.DefaultTexture.Fullbright = bright;
1710 part.UpdateTexture(tex); 1710 part.UpdateTextureEntry(tex.GetBytes());
1711 return; 1711 return;
1712 } 1712 }
1713 } 1713 }
@@ -1776,7 +1776,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1776 texcolor = tex.CreateFace((uint)face).RGBA; 1776 texcolor = tex.CreateFace((uint)face).RGBA;
1777 texcolor.A = Util.Clip((float)alpha, 0.0f, 1.0f); 1777 texcolor.A = Util.Clip((float)alpha, 0.0f, 1.0f);
1778 tex.FaceTextures[face].RGBA = texcolor; 1778 tex.FaceTextures[face].RGBA = texcolor;
1779 part.UpdateTexture(tex); 1779 part.UpdateTextureEntry(tex.GetBytes());
1780 return; 1780 return;
1781 } 1781 }
1782 else if (face == ScriptBaseClass.ALL_SIDES) 1782 else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1800,7 +1800,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1800 tex.DefaultTexture.RGBA = texcolor; 1800 tex.DefaultTexture.RGBA = texcolor;
1801 } 1801 }
1802 1802
1803 part.UpdateTexture(tex); 1803 part.UpdateTextureEntry(tex.GetBytes());
1804 return; 1804 return;
1805 } 1805 }
1806 } 1806 }
@@ -1969,7 +1969,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1969 Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); 1969 Primitive.TextureEntryFace texface = tex.CreateFace((uint)face);
1970 texface.TextureID = textureID; 1970 texface.TextureID = textureID;
1971 tex.FaceTextures[face] = texface; 1971 tex.FaceTextures[face] = texface;
1972 part.UpdateTexture(tex); 1972 part.UpdateTextureEntry(tex.GetBytes());
1973 return; 1973 return;
1974 } 1974 }
1975 else if (face == ScriptBaseClass.ALL_SIDES) 1975 else if (face == ScriptBaseClass.ALL_SIDES)
@@ -1982,7 +1982,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1982 } 1982 }
1983 } 1983 }
1984 tex.DefaultTexture.TextureID = textureID; 1984 tex.DefaultTexture.TextureID = textureID;
1985 part.UpdateTexture(tex); 1985 part.UpdateTextureEntry(tex.GetBytes());
1986 return; 1986 return;
1987 } 1987 }
1988 } 1988 }
@@ -2007,7 +2007,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2007 texface.RepeatU = (float)u; 2007 texface.RepeatU = (float)u;
2008 texface.RepeatV = (float)v; 2008 texface.RepeatV = (float)v;
2009 tex.FaceTextures[face] = texface; 2009 tex.FaceTextures[face] = texface;
2010 part.UpdateTexture(tex); 2010 part.UpdateTextureEntry(tex.GetBytes());
2011 return; 2011 return;
2012 } 2012 }
2013 if (face == ScriptBaseClass.ALL_SIDES) 2013 if (face == ScriptBaseClass.ALL_SIDES)
@@ -2022,7 +2022,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2022 } 2022 }
2023 tex.DefaultTexture.RepeatU = (float)u; 2023 tex.DefaultTexture.RepeatU = (float)u;
2024 tex.DefaultTexture.RepeatV = (float)v; 2024 tex.DefaultTexture.RepeatV = (float)v;
2025 part.UpdateTexture(tex); 2025 part.UpdateTextureEntry(tex.GetBytes());
2026 return; 2026 return;
2027 } 2027 }
2028 } 2028 }
@@ -2046,7 +2046,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2046 texface.OffsetU = (float)u; 2046 texface.OffsetU = (float)u;
2047 texface.OffsetV = (float)v; 2047 texface.OffsetV = (float)v;
2048 tex.FaceTextures[face] = texface; 2048 tex.FaceTextures[face] = texface;
2049 part.UpdateTexture(tex); 2049 part.UpdateTextureEntry(tex.GetBytes());
2050 return; 2050 return;
2051 } 2051 }
2052 if (face == ScriptBaseClass.ALL_SIDES) 2052 if (face == ScriptBaseClass.ALL_SIDES)
@@ -2061,7 +2061,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2061 } 2061 }
2062 tex.DefaultTexture.OffsetU = (float)u; 2062 tex.DefaultTexture.OffsetU = (float)u;
2063 tex.DefaultTexture.OffsetV = (float)v; 2063 tex.DefaultTexture.OffsetV = (float)v;
2064 part.UpdateTexture(tex); 2064 part.UpdateTextureEntry(tex.GetBytes());
2065 return; 2065 return;
2066 } 2066 }
2067 } 2067 }
@@ -2084,7 +2084,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2084 Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); 2084 Primitive.TextureEntryFace texface = tex.CreateFace((uint)face);
2085 texface.Rotation = (float)rotation; 2085 texface.Rotation = (float)rotation;
2086 tex.FaceTextures[face] = texface; 2086 tex.FaceTextures[face] = texface;
2087 part.UpdateTexture(tex); 2087 part.UpdateTextureEntry(tex.GetBytes());
2088 return; 2088 return;
2089 } 2089 }
2090 if (face == ScriptBaseClass.ALL_SIDES) 2090 if (face == ScriptBaseClass.ALL_SIDES)
@@ -2097,7 +2097,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2097 } 2097 }
2098 } 2098 }
2099 tex.DefaultTexture.Rotation = (float)rotation; 2099 tex.DefaultTexture.Rotation = (float)rotation;
2100 part.UpdateTexture(tex); 2100 part.UpdateTextureEntry(tex.GetBytes());
2101 return; 2101 return;
2102 } 2102 }
2103 } 2103 }