diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-04-04 17:10:28 -0700 |
| commit | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (patch) | |
| tree | c1b61940e39d615201e18259bcab1762c5a8c655 /indra/llrender/llrender.cpp | |
| parent | f684d897f532bcba87cda1f72bd19efac82f6cb6 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
Merge with viewer-development
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) { |