diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-11-03 09:51:04 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-11-03 09:51:04 -0700 |
| commit | 89e4e6993f3cb11dd2206795c30834594880f52f (patch) | |
| tree | 520f5ac6bcd8f111b26e77f8c49840b331ce3ab1 /indra/llwindow | |
| parent | dfb44aec706532cd26a1fcc6415cc7fdadec9907 (diff) | |
| parent | c86efd6c03a0de1d593006787a1850d49bb7e726 (diff) | |
Merge branch brad/SL-19968-inventory-skel-background into 'origin/DRTVWR-559' (#489)
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index b99af1ae4c..778e5d3898 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1962,10 +1962,12 @@ public: void* LLWindowMacOSX::createSharedContext() { sharedContext* sc = new sharedContext(); - CGLError err = CGLCreateContext(mPixelFormat, mContext, &(sc->mContext)); - llassert(err == kCGLNoError); - - CGLEnable(mContext, kCGLCEMPEngine); + CGLCreateContext(mPixelFormat, mContext, &(sc->mContext)); + + if (sUseMultGL) + { + CGLEnable(mContext, kCGLCEMPEngine); + } return (void *)sc; } |