diff options
| author | Melanie | 2011-12-05 18:54:31 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-05 18:54:31 +0000 |
| commit | cc482ee865efb06c05f5bd25943fdab30c0170a7 (patch) | |
| tree | cc1bee262b25bf10c0ccbb50512d09ec8efec432 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Fix CHANGED_TEXTURE and CHANGED_COLOR. (diff) | |
| download | opensim-SC_OLD-cc482ee865efb06c05f5bd25943fdab30c0170a7.zip opensim-SC_OLD-cc482ee865efb06c05f5bd25943fdab30c0170a7.tar.gz opensim-SC_OLD-cc482ee865efb06c05f5bd25943fdab30c0170a7.tar.bz2 opensim-SC_OLD-cc482ee865efb06c05f5bd25943fdab30c0170a7.tar.xz | |
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 f2c8b3d..18bd018 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
| @@ -355,7 +355,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
| 355 | // I'm pretty sure noone whats to set fullbright true if it wasn't true before. | 355 | // I'm pretty sure noone whats to set fullbright true if it wasn't true before. |
| 356 | // tmptex.DefaultTexture.Fullbright = true; | 356 | // tmptex.DefaultTexture.Fullbright = true; |
| 357 | 357 | ||
| 358 | part.UpdateTexture(tmptex); | 358 | part.UpdateTextureEntry(tmptex.GetBytes()); |
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0)) | 361 | if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0)) |
| @@ -437,4 +437,4 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
| 437 | 437 | ||
| 438 | #endregion | 438 | #endregion |
| 439 | } | 439 | } |
| 440 | } \ No newline at end of file | 440 | } |