diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-09-27 16:54:18 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-09-27 16:54:18 -0400 |
| commit | f6649fc31fa837a5650beb776b5f7f26e53440ec (patch) | |
| tree | 16ef5a0e38883580ef637a09f314c59c52c4f84a /indra/llrender/llimagegl.cpp | |
| parent | 352698140775e62498686f80b5aa21aee85524cf (diff) | |
| parent | 637fb26dd892d57a87698180adf9a8122c48b996 (diff) | |
Merging sunshine-experimental into sunshine-internal
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
| -rwxr-xr-x | indra/llrender/llimagegl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index a4d7872ec2..d561f63544 100755 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1222,7 +1222,6 @@ void LLImageGL::setManualImage(U32 target, S32 miplevel, S32 intformat, S32 widt //the texture is assiciate with some image by calling glTexImage outside LLImageGL BOOL LLImageGL::createGLTexture() { - if (gHeadlessClient) return FALSE; if (gGLManager.mIsDisabled) { llwarns << "Trying to create a texture while GL is disabled!" << llendl; @@ -1252,7 +1251,6 @@ BOOL LLImageGL::createGLTexture() BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename/*=0*/, BOOL to_create, S32 category) { - if (gHeadlessClient) return FALSE; if (gGLManager.mIsDisabled) { llwarns << "Trying to create a texture while GL is disabled!" << llendl; |