From 3585130ac8b805296323105a5b50c5d416210266 Mon Sep 17 00:00:00 2001
From: unknown
Date: Mon, 31 Jan 2011 02:42:22 -0500
Subject: SetTexture_fix
---
.../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
(limited to 'OpenSim')
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
{
UUID textureID=new UUID();
- if (!UUID.TryParse(texture, out textureID))
- {
- textureID=InventoryKey(texture, (int)AssetType.Texture);
- }
-
- if (textureID == UUID.Zero)
- return;
+ textureID=InventoryKey(texture, (int)AssetType.Texture);
+ if (textureID == UUID.Zero)
+ {
+ if (!UUID.TryParse(texture, out textureID))
+ return;
+ }
Primitive.TextureEntry tex = part.Shape.Textures;
--
cgit v1.1