diff options
author | BlueWall | 2011-12-05 15:29:00 -0500 |
---|---|---|
committer | BlueWall | 2011-12-05 15:29:00 -0500 |
commit | 2d3dda6db391d0b74459ba0b4d77e13078b76913 (patch) | |
tree | b3391ff60a778b6809742cb0d1e53a67ece1b63c /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-2d3dda6db391d0b74459ba0b4d77e13078b76913.zip opensim-SC_OLD-2d3dda6db391d0b74459ba0b4d77e13078b76913.tar.gz opensim-SC_OLD-2d3dda6db391d0b74459ba0b4d77e13078b76913.tar.bz2 opensim-SC_OLD-2d3dda6db391d0b74459ba0b4d77e13078b76913.tar.xz |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 6c418df..6d067b0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1424,7 +1424,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1424 | { | 1424 | { |
1425 | tex.CreateFace((uint) face); | 1425 | tex.CreateFace((uint) face); |
1426 | tex.FaceTextures[face].TexMapType = textype; | 1426 | tex.FaceTextures[face].TexMapType = textype; |
1427 | part.UpdateTexture(tex); | 1427 | part.UpdateTextureEntry(tex.GetBytes()); |
1428 | return; | 1428 | return; |
1429 | } | 1429 | } |
1430 | else if (face == ScriptBaseClass.ALL_SIDES) | 1430 | else if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1437 | } | 1437 | } |
1438 | tex.DefaultTexture.TexMapType = textype; | 1438 | tex.DefaultTexture.TexMapType = textype; |
1439 | } | 1439 | } |
1440 | part.UpdateTexture(tex); | 1440 | part.UpdateTextureEntry(tex.GetBytes()); |
1441 | return; | 1441 | return; |
1442 | } | 1442 | } |
1443 | } | 1443 | } |
@@ -1449,7 +1449,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1449 | { | 1449 | { |
1450 | tex.CreateFace((uint) face); | 1450 | tex.CreateFace((uint) face); |
1451 | tex.FaceTextures[face].Glow = glow; | 1451 | tex.FaceTextures[face].Glow = glow; |
1452 | part.UpdateTexture(tex); | 1452 | part.UpdateTextureEntry(tex.GetBytes()); |
1453 | return; | 1453 | return; |
1454 | } | 1454 | } |
1455 | else if (face == ScriptBaseClass.ALL_SIDES) | 1455 | else if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1462,7 +1462,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1462 | } | 1462 | } |
1463 | tex.DefaultTexture.Glow = glow; | 1463 | tex.DefaultTexture.Glow = glow; |
1464 | } | 1464 | } |
1465 | part.UpdateTexture(tex); | 1465 | part.UpdateTextureEntry(tex.GetBytes()); |
1466 | return; | 1466 | return; |
1467 | } | 1467 | } |
1468 | } | 1468 | } |
@@ -1497,7 +1497,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1497 | tex.CreateFace((uint) face); | 1497 | tex.CreateFace((uint) face); |
1498 | tex.FaceTextures[face].Shiny = sval; | 1498 | tex.FaceTextures[face].Shiny = sval; |
1499 | tex.FaceTextures[face].Bump = bump; | 1499 | tex.FaceTextures[face].Bump = bump; |
1500 | part.UpdateTexture(tex); | 1500 | part.UpdateTextureEntry(tex.GetBytes()); |
1501 | return; | 1501 | return; |
1502 | } | 1502 | } |
1503 | else if (face == ScriptBaseClass.ALL_SIDES) | 1503 | else if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1512,7 +1512,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1512 | tex.DefaultTexture.Shiny = sval; | 1512 | tex.DefaultTexture.Shiny = sval; |
1513 | tex.DefaultTexture.Bump = bump; | 1513 | tex.DefaultTexture.Bump = bump; |
1514 | } | 1514 | } |
1515 | part.UpdateTexture(tex); | 1515 | part.UpdateTextureEntry(tex.GetBytes()); |
1516 | return; | 1516 | return; |
1517 | } | 1517 | } |
1518 | } | 1518 | } |
@@ -1524,7 +1524,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1524 | { | 1524 | { |
1525 | tex.CreateFace((uint) face); | 1525 | tex.CreateFace((uint) face); |
1526 | tex.FaceTextures[face].Fullbright = bright; | 1526 | tex.FaceTextures[face].Fullbright = bright; |
1527 | part.UpdateTexture(tex); | 1527 | part.UpdateTextureEntry(tex.GetBytes()); |
1528 | return; | 1528 | return; |
1529 | } | 1529 | } |
1530 | else if (face == ScriptBaseClass.ALL_SIDES) | 1530 | else if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1537,7 +1537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1537 | } | 1537 | } |
1538 | } | 1538 | } |
1539 | tex.DefaultTexture.Fullbright = bright; | 1539 | tex.DefaultTexture.Fullbright = bright; |
1540 | part.UpdateTexture(tex); | 1540 | part.UpdateTextureEntry(tex.GetBytes()); |
1541 | return; | 1541 | return; |
1542 | } | 1542 | } |
1543 | } | 1543 | } |
@@ -1593,7 +1593,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1593 | texcolor = tex.CreateFace((uint)face).RGBA; | 1593 | texcolor = tex.CreateFace((uint)face).RGBA; |
1594 | texcolor.A = Util.Clip((float)alpha, 0.0f, 1.0f); | 1594 | texcolor.A = Util.Clip((float)alpha, 0.0f, 1.0f); |
1595 | tex.FaceTextures[face].RGBA = texcolor; | 1595 | tex.FaceTextures[face].RGBA = texcolor; |
1596 | part.UpdateTexture(tex); | 1596 | part.UpdateTextureEntry(tex.GetBytes()); |
1597 | return; | 1597 | return; |
1598 | } | 1598 | } |
1599 | else if (face == ScriptBaseClass.ALL_SIDES) | 1599 | else if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1617,7 +1617,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1617 | tex.DefaultTexture.RGBA = texcolor; | 1617 | tex.DefaultTexture.RGBA = texcolor; |
1618 | } | 1618 | } |
1619 | 1619 | ||
1620 | part.UpdateTexture(tex); | 1620 | part.UpdateTextureEntry(tex.GetBytes()); |
1621 | return; | 1621 | return; |
1622 | } | 1622 | } |
1623 | } | 1623 | } |
@@ -1774,7 +1774,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1774 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); | 1774 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); |
1775 | texface.TextureID = textureID; | 1775 | texface.TextureID = textureID; |
1776 | tex.FaceTextures[face] = texface; | 1776 | tex.FaceTextures[face] = texface; |
1777 | part.UpdateTexture(tex); | 1777 | part.UpdateTextureEntry(tex.GetBytes()); |
1778 | return; | 1778 | return; |
1779 | } | 1779 | } |
1780 | else if (face == ScriptBaseClass.ALL_SIDES) | 1780 | else if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1787,7 +1787,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1787 | } | 1787 | } |
1788 | } | 1788 | } |
1789 | tex.DefaultTexture.TextureID = textureID; | 1789 | tex.DefaultTexture.TextureID = textureID; |
1790 | part.UpdateTexture(tex); | 1790 | part.UpdateTextureEntry(tex.GetBytes()); |
1791 | return; | 1791 | return; |
1792 | } | 1792 | } |
1793 | } | 1793 | } |
@@ -1809,7 +1809,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1809 | texface.RepeatU = (float)u; | 1809 | texface.RepeatU = (float)u; |
1810 | texface.RepeatV = (float)v; | 1810 | texface.RepeatV = (float)v; |
1811 | tex.FaceTextures[face] = texface; | 1811 | tex.FaceTextures[face] = texface; |
1812 | part.UpdateTexture(tex); | 1812 | part.UpdateTextureEntry(tex.GetBytes()); |
1813 | return; | 1813 | return; |
1814 | } | 1814 | } |
1815 | if (face == ScriptBaseClass.ALL_SIDES) | 1815 | if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1824,7 +1824,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1824 | } | 1824 | } |
1825 | tex.DefaultTexture.RepeatU = (float)u; | 1825 | tex.DefaultTexture.RepeatU = (float)u; |
1826 | tex.DefaultTexture.RepeatV = (float)v; | 1826 | tex.DefaultTexture.RepeatV = (float)v; |
1827 | part.UpdateTexture(tex); | 1827 | part.UpdateTextureEntry(tex.GetBytes()); |
1828 | return; | 1828 | return; |
1829 | } | 1829 | } |
1830 | } | 1830 | } |
@@ -1845,7 +1845,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1845 | texface.OffsetU = (float)u; | 1845 | texface.OffsetU = (float)u; |
1846 | texface.OffsetV = (float)v; | 1846 | texface.OffsetV = (float)v; |
1847 | tex.FaceTextures[face] = texface; | 1847 | tex.FaceTextures[face] = texface; |
1848 | part.UpdateTexture(tex); | 1848 | part.UpdateTextureEntry(tex.GetBytes()); |
1849 | return; | 1849 | return; |
1850 | } | 1850 | } |
1851 | if (face == ScriptBaseClass.ALL_SIDES) | 1851 | if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1860,7 +1860,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1860 | } | 1860 | } |
1861 | tex.DefaultTexture.OffsetU = (float)u; | 1861 | tex.DefaultTexture.OffsetU = (float)u; |
1862 | tex.DefaultTexture.OffsetV = (float)v; | 1862 | tex.DefaultTexture.OffsetV = (float)v; |
1863 | part.UpdateTexture(tex); | 1863 | part.UpdateTextureEntry(tex.GetBytes()); |
1864 | return; | 1864 | return; |
1865 | } | 1865 | } |
1866 | } | 1866 | } |
@@ -1880,7 +1880,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1880 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); | 1880 | Primitive.TextureEntryFace texface = tex.CreateFace((uint)face); |
1881 | texface.Rotation = (float)rotation; | 1881 | texface.Rotation = (float)rotation; |
1882 | tex.FaceTextures[face] = texface; | 1882 | tex.FaceTextures[face] = texface; |
1883 | part.UpdateTexture(tex); | 1883 | part.UpdateTextureEntry(tex.GetBytes()); |
1884 | return; | 1884 | return; |
1885 | } | 1885 | } |
1886 | if (face == ScriptBaseClass.ALL_SIDES) | 1886 | if (face == ScriptBaseClass.ALL_SIDES) |
@@ -1893,7 +1893,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1893 | } | 1893 | } |
1894 | } | 1894 | } |
1895 | tex.DefaultTexture.Rotation = (float)rotation; | 1895 | tex.DefaultTexture.Rotation = (float)rotation; |
1896 | part.UpdateTexture(tex); | 1896 | part.UpdateTextureEntry(tex.GetBytes()); |
1897 | return; | 1897 | return; |
1898 | } | 1898 | } |
1899 | } | 1899 | } |