diff options
| author | Justin Clark-Casey (justincc) | 2010-02-08 21:39:46 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-02-08 21:39:46 +0000 |
| commit | aba59088604bbc422af7f670226e1b5c91acab41 (patch) | |
| tree | 9896e48143101a20eddf38921ad646702f48146b /OpenSim/Region/CoreModules/Scripting | |
| parent | add some method doc to IDynamicTextureManager (diff) | |
| parent | Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched (diff) | |
| download | opensim-SC-aba59088604bbc422af7f670226e1b5c91acab41.zip opensim-SC-aba59088604bbc422af7f670226e1b5c91acab41.tar.gz opensim-SC-aba59088604bbc422af7f670226e1b5c91acab41.tar.bz2 opensim-SC-aba59088604bbc422af7f670226e1b5c91acab41.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 24 |
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 | ||