summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowwin32.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-28 10:35:22 -0400
committerOz Linden <oz@lindenlab.com>2012-06-28 10:35:22 -0400
commit764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (patch)
treea2ac72c6625c729e73ae6077e790a104c2b598a3 /indra/llwindow/llwindowwin32.cpp
parentba90a4ec367d47a6876962d7d071cf4615289a11 (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
merge up to 3.3.3-release
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
-rw-r--r--indra/llwindow/llwindowwin32.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index bc85acbf45..e07fbddb94 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1477,7 +1477,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
}
else
{
- llinfos << "Created OpenGL " << llformat("%d.%d", attribs[1], attribs[3]) << " context." << llendl;
+ llinfos << "Created OpenGL " << llformat("%d.%d", attribs[1], attribs[3]) <<
+ (LLRender::sGLCoreProfile ? " core" : " compatibility") << " context." << llendl;
done = true;
if (LLRender::sGLCoreProfile)