diff options
| author | Mic Bowman | 2011-02-04 14:22:17 -0800 |
|---|---|---|
| committer | Mic Bowman | 2011-02-04 14:22:17 -0800 |
| commit | bb69a40fbb563503e594bc9576a28c440a808ef2 (patch) | |
| tree | b5246768e592bf80c396a4d2df377059097322f8 /OpenSim/Region/ScriptEngine/Shared/Api | |
| parent | Convert SimianMaptile refresh time from ms to seconds. Too many 0's (diff) | |
| parent | minor: fix indentation, spacing on commit 3585130 (diff) | |
| download | opensim-SC-bb69a40fbb563503e594bc9576a28c440a808ef2.zip opensim-SC-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.gz opensim-SC-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.bz2 opensim-SC-bb69a40fbb563503e594bc9576a28c440a808ef2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 17 |
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 | ||