diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-05 19:44:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-05 19:44:47 -0400 |
| commit | a08c362d88487a390de340d75c3394c8800546be (patch) | |
| tree | 1d4a25d8df0a07b85f135cb6359b4d6c8f37fe76 /indra/newview/llviewershadermgr.h | |
| parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) | |
| parent | 0c7f003bfc3bb9f74b0194ce18861514efe77066 (diff) | |
merge up latest viewer-development
Diffstat (limited to 'indra/newview/llviewershadermgr.h')
| -rw-r--r-- | indra/newview/llviewershadermgr.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/indra/newview/llviewershadermgr.h b/indra/newview/llviewershadermgr.h index db880fded6..e958cf1172 100644 --- a/indra/newview/llviewershadermgr.h +++ b/indra/newview/llviewershadermgr.h @@ -240,20 +240,12 @@ public: base_iter_t mIter; }; - shader_iter beginShaders() const - { - return mShaderList.begin(); - } - - shader_iter endShaders() const - { - return mShaderList.end(); - } - + shader_iter beginShaders() const; + shader_iter endShaders() const; - /* virtual */ std::string getShaderDirPrefix(void); // Virtual + /* virtual */ std::string getShaderDirPrefix(void); - /* virtual */ void updateShaderUniforms(LLGLSLShader * shader); // Virtual + /* virtual */ void updateShaderUniforms(LLGLSLShader * shader); private: |