diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-20 04:42:46 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-20 04:42:46 +0000 |
| commit | f4ae8f1c4db6caabef629a7c9bb2d31344c61874 (patch) | |
| tree | ff64f474f57acbcf8fb67692bf4f8a70bc0ae526 /indra/llrender/llrender.cpp | |
| parent | 7153d1db11c00245a379fa9601f092020152ea73 (diff) | |
| parent | 2c60cfdde3b6e3301942139ae5004bd4d480c955 (diff) | |
Merge sunshine-internal -> sunshine-experimental
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 4597d06260..c60eb8d9d9 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -357,7 +357,6 @@ bool LLTexUnit::bind(LLCubeMap* cubeMap) } // LLRenderTarget is unavailible on the mapserver since it uses FBOs. -#if !LL_MESA_HEADLESS bool LLTexUnit::bind(LLRenderTarget* renderTarget, bool bindDepth) { if (mIndex < 0) return false; @@ -380,7 +379,6 @@ bool LLTexUnit::bind(LLRenderTarget* renderTarget, bool bindDepth) return true; } -#endif // LL_MESA_HEADLESS bool LLTexUnit::bindManual(eTextureType type, U32 texture, bool hasMips) { |