diff options
| author | Don Kjer <don@lindenlab.com> | 2011-06-03 23:58:58 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-06-03 23:58:58 +0000 |
| commit | c32b0122ab915ce9bd0cfd8ec330495f2832d97d (patch) | |
| tree | 064e3ab7b7b2a378302d3a993c62e0ee11abaf2f /indra/llrender/llglslshader.cpp | |
| parent | 357062a196e69a41f12afc156c3be225438f7a85 (diff) | |
| parent | 7dbf6ebb74e8f9c5b683529cc037cdb21b7d9550 (diff) | |
Merge
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 5473f23d86..8e99f62de6 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -48,7 +48,7 @@ using std::pair; using std::make_pair; using std::string; -U32 LLGLSLShader::sCurBoundShader = 0; +GLhandleARB LLGLSLShader::sCurBoundShader = 0; BOOL shouldChange(const LLVector4& v1, const LLVector4& v2) { |