aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-02-06 00:37:07 -0500
committerTeravus Ovares (Dan Olivares)2010-02-06 00:37:07 -0500
commit59f6606ecf4ea7ac3928aec20d1528222961458b (patch)
treefd5d81608af122a2b19baccece7c134c5cef2713 /OpenSim/Region
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-59f6606ecf4ea7ac3928aec20d1528222961458b.zip
opensim-SC_OLD-59f6606ecf4ea7ac3928aec20d1528222961458b.tar.gz
opensim-SC_OLD-59f6606ecf4ea7ac3928aec20d1528222961458b.tar.bz2
opensim-SC_OLD-59f6606ecf4ea7ac3928aec20d1528222961458b.tar.xz
Endline fix
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 679c871..e3c7bbf 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -358,18 +358,18 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
358 // tmptex.DefaultTexture.Fullbright = true; 358 // tmptex.DefaultTexture.Fullbright = true;
359 359
360 part.UpdateTexture(tmptex); 360 part.UpdateTexture(tmptex);
361 } 361 }
362 362
363 if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0)) 363 if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
364 { 364 {
365 if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString()); 365 if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
366 if (oldAsset != null) 366 if (oldAsset != null)
367 { 367 {
368 if (oldAsset.Temporary == true) 368 if (oldAsset.Temporary == true)
369 { 369 {
370 scene.AssetService.Delete(oldID.ToString()); 370 scene.AssetService.Delete(oldID.ToString());
371 } 371 }
372 } 372 }
373 } 373 }
374 } 374 }
375 375