summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-07-11 21:46:10 -0400
committerGeenz <geenz@geenzo.com>2013-07-11 21:46:10 -0400
commit2f680eec93f1b06620c04af04116fe49d577cf8f (patch)
tree301cb462c5ec9baaed005b4944cc9f5963164693 /indra/llwindow/llwindowmacosx.cpp
parenta787e272c31d8e535dae75e4d95365d17cec78db (diff)
A bit of cleanup and make the return of showAlert match the OSBTN return types in llwindow.h.
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
-rwxr-xr-xindra/llwindow/llwindowmacosx.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index beb9ebe8e0..a3e88ea7dc 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -164,7 +164,6 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
// Stash an object pointer for OSMessageBox()
gWindowImplementation = this;
// Create the GL context and set it up for windowed or fullscreen, as appropriate.
- LL_INFOS("Window") << "Creating context..." << LL_ENDL;
if(createContext(x, y, width, height, 32, fullscreen, disable_vsync))
{
if(mWindow != NULL)
@@ -526,13 +525,11 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
if (mWindow == NULL)
{
- LL_INFOS("Window") << "Creating window..." << LL_ENDL;
mWindow = getMainAppWindow();
}
if(mContext == NULL)
{
- LL_INFOS("Window") << "Creating GL view..." << LL_ENDL;
// Our OpenGL view is already defined within SecondLife.xib.
// Get the view instead.
mGLView = createOpenGLView(mWindow, mFSAASamples, !disable_vsync);
@@ -565,12 +562,10 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
GLint frames_per_swap = 0;
if (disable_vsync)
{
- LL_DEBUGS("GLInit") << "Disabling vertical sync" << LL_ENDL;
frames_per_swap = 0;
}
else
{
- LL_DEBUGS("GLinit") << "Keeping vertical sync" << LL_ENDL;
frames_per_swap = 1;
}
@@ -593,9 +588,8 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
LL_DEBUGS("GLInit") << "Multi-threaded OpenGL enabled." << LL_ENDL;
}
}
- LL_INFOS("Window") << "Completed context creation." << LL_ENDL;
makeFirstResponder(mWindow, mGLView);
- // Don't need to get the current gamma, since there's a call that restores it to the system defaults.
+
return TRUE;
}