aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs17
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 30fb252..e8da274 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1748,15 +1748,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1748 1748
1749 protected void SetTexture(SceneObjectPart part, string texture, int face) 1749 protected void SetTexture(SceneObjectPart part, string texture, int face)
1750 { 1750 {
1751 UUID textureID=new UUID(); 1751 UUID textureID = new UUID();
1752 1752
1753 if (!UUID.TryParse(texture, out textureID)) 1753 textureID = InventoryKey(texture, (int)AssetType.Texture);
1754 { 1754 if (textureID == UUID.Zero)
1755 textureID=InventoryKey(texture, (int)AssetType.Texture); 1755 {
1756 } 1756 if (!UUID.TryParse(texture, out textureID))
1757 1757 return;
1758 if (textureID == UUID.Zero) 1758 }
1759 return;
1760 1759
1761 Primitive.TextureEntry tex = part.Shape.Textures; 1760 Primitive.TextureEntry tex = part.Shape.Textures;
1762 1761