diff options
| author | Justin Clark-Casey (justincc) | 2011-02-04 21:55:22 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-02-04 21:55:22 +0000 |
| commit | bc2e254b55b65cf267b8027e3e696acbc0f3c60b (patch) | |
| tree | d0790838dbcc16af41ce71411de337a7f6267b02 /OpenSim | |
| parent | SetTexture_fix (diff) | |
| download | opensim-SC_OLD-bc2e254b55b65cf267b8027e3e696acbc0f3c60b.zip opensim-SC_OLD-bc2e254b55b65cf267b8027e3e696acbc0f3c60b.tar.gz opensim-SC_OLD-bc2e254b55b65cf267b8027e3e696acbc0f3c60b.tar.bz2 opensim-SC_OLD-bc2e254b55b65cf267b8027e3e696acbc0f3c60b.tar.xz | |
minor: fix indentation, spacing on commit 3585130
this previous commit tries to look up the texture by name first before just using the uuid.
this allows correct resolution of inventory textures which have uuids as names.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 38a16a4..e8da274 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -1748,14 +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 | textureID=InventoryKey(texture, (int)AssetType.Texture); | 1753 | textureID = InventoryKey(texture, (int)AssetType.Texture); |
| 1754 | if (textureID == UUID.Zero) | 1754 | if (textureID == UUID.Zero) |
| 1755 | { | 1755 | { |
| 1756 | if (!UUID.TryParse(texture, out textureID)) | 1756 | if (!UUID.TryParse(texture, out textureID)) |
| 1757 | return; | 1757 | return; |
| 1758 | } | 1758 | } |
| 1759 | 1759 | ||
| 1760 | Primitive.TextureEntry tex = part.Shape.Textures; | 1760 | Primitive.TextureEntry tex = part.Shape.Textures; |
| 1761 | 1761 | ||