aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorunknown2011-01-31 02:42:22 -0500
committerJustin Clark-Casey (justincc)2011-02-04 21:52:06 +0000
commit3585130ac8b805296323105a5b50c5d416210266 (patch)
treedfb89e27e75943e7e2a88d79eb099eed66be729a /OpenSim/Region
parentminor: correct a log spelling mistake that was pointed out to me (diff)
downloadopensim-SC_OLD-3585130ac8b805296323105a5b50c5d416210266.zip
opensim-SC_OLD-3585130ac8b805296323105a5b50c5d416210266.tar.gz
opensim-SC_OLD-3585130ac8b805296323105a5b50c5d416210266.tar.bz2
opensim-SC_OLD-3585130ac8b805296323105a5b50c5d416210266.tar.xz
SetTexture_fix
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs13
1 files changed, 6 insertions, 7 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..38a16a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1750,13 +1750,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
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