2 files changed, 20 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 59d5f08..89202b2 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -7230,7 +7230,16 @@ namespace OpenSim.Region.ScriptEngine.Common
         public void llSetLinkTexture(int linknumber, string texture, int face)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llSetLinkTexture");
+
+            if (m_host.ParentGroup == null)
+                return;
+
+            SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber);
+
+            if (part == null)
+                return;
+
+            SetTexture(part, texture, face);
         }
 
         public string llStringTrim(string src, int type)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c5f1763..7080ad1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7008,7 +7008,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetLinkTexture(int linknumber, string texture, int face)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llSetLinkTexture");
+
+            if (m_host.ParentGroup == null)
+                return;
+
+            SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber);
+
+            if (part == null)
+                return;
+
+            SetTexture(part, texture, face);
         }
 
         public string llStringTrim(string src, int type)