diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-05-03 20:52:10 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-05-03 20:52:10 +0000 |
| commit | 217c6a86ec61963578ce3eb0c76ff3a96e63a995 (patch) | |
| tree | dab3c478a6a0e85abb19b36e4c89ea21da8c2a8a /indra/llrender/llrendertarget.h | |
| parent | f67fe8fce7d84bc8687d409311518565d97a5fc5 (diff) | |
| parent | 89c24095c6c1b778b93a4eb7ad398627f4d5479f (diff) | |
Merged in graham_linden/viewer-eep-rc-fixes (pull request #378)
SL-11087, SL-11086, SL-11092, SL-11075, SL-11070, SL-11090, SL-11085
Diffstat (limited to 'indra/llrender/llrendertarget.h')
| -rw-r--r-- | indra/llrender/llrendertarget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h index 6dc84d978d..6c07ac5b1c 100644 --- a/indra/llrender/llrendertarget.h +++ b/indra/llrender/llrendertarget.h @@ -120,7 +120,7 @@ public: U32 getDepth(void) const { return mDepth; } bool hasStencil() const { return mStencil; } - void bindTexture(U32 index, S32 channel); + void bindTexture(U32 index, S32 channel, LLTexUnit::eTextureFilterOptions filter_options = LLTexUnit::TFO_BILINEAR); //flush rendering operations //must be called when rendering is complete |