diff options
| author | McCabe Maxsted | 2010-10-17 00:28:12 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-17 00:28:12 -0700 |
| commit | 277ddc7a3d42d1bdf16797e93904d2aac16a61d0 (patch) | |
| tree | 624e4c80267e00bf571354f24fabd430732becf7 /linden/indra/newview/llvlcomposition.h | |
| parent | Several minor changes to how group chat ignore works users won't see (diff) | |
| parent | fix bug #450 Terrain textures render rainbow (diff) | |
| download | meta-impy-277ddc7a3d42d1bdf16797e93904d2aac16a61d0.zip meta-impy-277ddc7a3d42d1bdf16797e93904d2aac16a61d0.tar.gz meta-impy-277ddc7a3d42d1bdf16797e93904d2aac16a61d0.tar.bz2 meta-impy-277ddc7a3d42d1bdf16797e93904d2aac16a61d0.tar.xz | |
Merge remote branch 'armin/weekly' into weekly
Diffstat (limited to 'linden/indra/newview/llvlcomposition.h')
| -rw-r--r-- | linden/indra/newview/llvlcomposition.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llvlcomposition.h b/linden/indra/newview/llvlcomposition.h index 4ae296c..eb61bfd 100644 --- a/linden/indra/newview/llvlcomposition.h +++ b/linden/indra/newview/llvlcomposition.h | |||
| @@ -67,7 +67,7 @@ public: | |||
| 67 | F32 getHeightRange(S32 corner); | 67 | F32 getHeightRange(S32 corner); |
| 68 | 68 | ||
| 69 | void setDetailTextureID(S32 corner, const LLUUID& id); | 69 | void setDetailTextureID(S32 corner, const LLUUID& id); |
| 70 | void setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate); | 70 | void setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate, LLGLint internal_format, LLGLenum primary_format, const LLUUID& force_id); |
| 71 | void setStartHeight(S32 corner, F32 start_height); | 71 | void setStartHeight(S32 corner, F32 start_height); |
| 72 | void setHeightRange(S32 corner, F32 range); | 72 | void setHeightRange(S32 corner, F32 range); |
| 73 | 73 | ||