diff options
| author | Signal Linden <signal@lindenlab.com> | 2022-10-10 10:01:10 -0700 |
|---|---|---|
| committer | Signal Linden <signal@lindenlab.com> | 2022-10-10 10:01:10 -0700 |
| commit | 977d7e9ea0c6b04b085704a4a7b64244522e770c (patch) | |
| tree | 80849436f1961ea58839808366dd1b3e2d07928f /indra/llwindow/llwindowmacosx.cpp | |
| parent | f2f9b32e753972d83087b9201a0073e208a0dd75 (diff) | |
| parent | 7018deb7f8bc22bdbab7be29896c92ec648a3f2f (diff) | |
Merge remote-tracking branch 'bb/DRTVWR-568' into actions
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 ba2420244f..22a5462c7f 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); - } } |