diff options
| author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
| commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
| tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/llrender/llshadermgr.cpp | |
| parent | 1.1 version final (diff) | |
| parent | Merge branch 'sl-base-1.22' into next (diff) | |
| download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz | |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | linden/indra/llrender/llshadermgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/llrender/llshadermgr.cpp b/linden/indra/llrender/llshadermgr.cpp index 4416775..3046d19 100644 --- a/linden/indra/llrender/llshadermgr.cpp +++ b/linden/indra/llrender/llshadermgr.cpp | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * $LicenseInfo:firstyear=2005&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2005&license=viewergpl$ |
| 6 | * | 6 | * |
| 7 | * Copyright (c) 2005-2008, Linden Research, Inc. | 7 | * Copyright (c) 2005-2009, Linden Research, Inc. |
| 8 | * | 8 | * |
| 9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
| 10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
| @@ -307,7 +307,7 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns) | |||
| 307 | { | 307 | { |
| 308 | LL_DEBUGS("ShaderLoading") << log << LL_ENDL; | 308 | LL_DEBUGS("ShaderLoading") << log << LL_ENDL; |
| 309 | } | 309 | } |
| 310 | } | 310 | } |
| 311 | } | 311 | } |
| 312 | 312 | ||
| 313 | GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type) | 313 | GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_level, GLenum type) |