diff options
author | Jeff Ames | 2009-06-09 18:07:35 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-09 18:07:35 +0000 |
commit | a7fcacf8f396acbca0b640a65acfbf5487d513e7 (patch) | |
tree | 5ba66f5c83eceeb81e24a0540ae4fac9847e0c78 /OpenSim/Region/CoreModules/Scripting/DynamicTexture | |
parent | Update svn properties. (diff) | |
download | opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.zip opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.gz opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.bz2 opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.xz |
Formatting cleanup. Ignore some generated files.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/DynamicTexture')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index a547df5..8c3d993 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -332,7 +332,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
332 | 332 | ||
333 | UUID oldID = UUID.Zero; | 333 | UUID oldID = UUID.Zero; |
334 | 334 | ||
335 | lock(part) | 335 | lock (part) |
336 | { | 336 | { |
337 | // mostly keep the values from before | 337 | // mostly keep the values from before |
338 | Primitive.TextureEntry tmptex = part.Shape.Textures; | 338 | Primitive.TextureEntry tmptex = part.Shape.Textures; |
@@ -340,7 +340,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
340 | // remove the old asset from the cache | 340 | // remove the old asset from the cache |
341 | oldID = tmptex.DefaultTexture.TextureID; | 341 | oldID = tmptex.DefaultTexture.TextureID; |
342 | 342 | ||
343 | if(Face == ALL_SIDES) | 343 | if (Face == ALL_SIDES) |
344 | { | 344 | { |
345 | tmptex.DefaultTexture.TextureID = asset.FullID; | 345 | tmptex.DefaultTexture.TextureID = asset.FullID; |
346 | } | 346 | } |