diff options
author | Justin Clarke Casey | 2008-10-07 14:58:56 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-07 14:58:56 +0000 |
commit | f085d53be29432960cf4cd52f752a1a7aa84ed19 (patch) | |
tree | f6e399e3f4f295ad75761e14269916d21e5fbc7a /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | * Apply http://opensimulator.org/mantis/view.php?id=1207 (diff) | |
download | opensim-SC_OLD-f085d53be29432960cf4cd52f752a1a7aa84ed19.zip opensim-SC_OLD-f085d53be29432960cf4cd52f752a1a7aa84ed19.tar.gz opensim-SC_OLD-f085d53be29432960cf4cd52f752a1a7aa84ed19.tar.bz2 opensim-SC_OLD-f085d53be29432960cf4cd52f752a1a7aa84ed19.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=2345
* Bring llSetLinkTexture into line with llSetLinkColor and lLSetLinkPrimitiveParams() implementations
* Thanks ralphos
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index c91159c..cc22994 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1521,6 +1521,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1521 | // ScriptSleep(200); | 1521 | // ScriptSleep(200); |
1522 | } | 1522 | } |
1523 | 1523 | ||
1524 | public void llSetLinkTexture(int linknumber, string texture, int face) | ||
1525 | { | ||
1526 | m_host.AddScriptLPS(1); | ||
1527 | |||
1528 | List<SceneObjectPart> parts = GetLinkParts(linknumber); | ||
1529 | |||
1530 | foreach (SceneObjectPart part in parts) | ||
1531 | SetTexture(part, texture, face); | ||
1532 | |||
1533 | // ScriptSleep(200); | ||
1534 | } | ||
1535 | |||
1524 | private void SetTexture(SceneObjectPart part, string texture, int face) | 1536 | private void SetTexture(SceneObjectPart part, string texture, int face) |
1525 | { | 1537 | { |
1526 | UUID textureID=new UUID(); | 1538 | UUID textureID=new UUID(); |
@@ -8026,22 +8038,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8026 | return ret; | 8038 | return ret; |
8027 | } | 8039 | } |
8028 | 8040 | ||
8029 | public void llSetLinkTexture(int linknumber, string texture, int face) | ||
8030 | { | ||
8031 | m_host.AddScriptLPS(1); | ||
8032 | |||
8033 | if (m_host.ParentGroup == null) | ||
8034 | return; | ||
8035 | |||
8036 | SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); | ||
8037 | |||
8038 | if (part == null) | ||
8039 | return; | ||
8040 | |||
8041 | SetTexture(part, texture, face); | ||
8042 | // ScriptSleep(200); | ||
8043 | } | ||
8044 | |||
8045 | public LSL_String llStringTrim(string src, int type) | 8041 | public LSL_String llStringTrim(string src, int type) |
8046 | { | 8042 | { |
8047 | m_host.AddScriptLPS(1); | 8043 | m_host.AddScriptLPS(1); |