diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-08-29 10:14:06 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-08-29 10:14:06 -0700 |
| commit | a3f7f7d8c08e19d338911e107707f756469716bc (patch) | |
| tree | c86773c81cbcb03300132eb684134b878aeca357 /indra/llwindow/llwindowmacosx.cpp | |
| parent | 35de5fc912c908fb1c3c5257f28e72ffebe796c4 (diff) | |
| parent | 592abc460c96b63b1b1e0d15914f7b64a0c88038 (diff) | |
Merge remote-tracking branch 'origin/more-c++17' into DRTVWR-568
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index bc4f07941b..b44c6138f4 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -621,8 +621,6 @@ void LLWindowMacOSX::getMouseDeltas(float* delta) BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits, BOOL fullscreen, BOOL enable_vsync) { - BOOL glNeedsInit = FALSE; - mFullscreen = fullscreen; if (mWindow == NULL) @@ -636,10 +634,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits // Get the view instead. mGLView = createOpenGLView(mWindow, mFSAASamples, enable_vsync); mContext = getCGLContextObj(mGLView); - - // Since we just created the context, it needs to be set up. - glNeedsInit = TRUE; - gGLManager.mVRAM = getVramSize(mGLView); } @@ -1719,12 +1713,6 @@ void LLSplashScreenMacOSX::showImpl() void LLSplashScreenMacOSX::updateImpl(const std::string& mesg) { - if(mWindow != NULL) - { - CFStringRef string = NULL; - - string = CFStringCreateWithCString(NULL, mesg.c_str(), kCFStringEncodingUTF8); - } } |