diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-07-15 23:23:48 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-07-15 23:23:48 +0000 |
| commit | e96356ce60a77401c531cb36f0e51eaa5fa72cd0 (patch) | |
| tree | 602ea73b6df01487765afeaced008d8c64f60594 /indra/llrender/llgl.cpp | |
| parent | 01bdbdb6acb4e315cb7de811d6ecced41fa0f9a7 (diff) | |
| parent | f6eab050178336a553f52837b8e8a4cc0bf6bacb (diff) | |
Merged in graham_linden/viewer-eep-g (pull request #462)
SL-10761, SL-11590, SL-10625
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index c555f556fa..c01c15391d 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -2051,7 +2051,8 @@ LLGLState::LLGLState(LLGLenum state, S32 enabled) : if (mState) { mWasEnabled = sStateMap[state]; - llassert(mWasEnabled == glIsEnabled(state)); + // we can't actually assert on this as queued changes to state are not reflected by glIsEnabled + //llassert(mWasEnabled == glIsEnabled(state)); setEnabled(enabled); stop_glerror(); } |