diff options
author | Logan Dethrow <log@lindenlab.com> | 2012-12-11 16:38:10 -0500 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2012-12-11 16:38:10 -0500 |
commit | 03025733484f7f1ea46d0356e65b0d142bc1dbdb (patch) | |
tree | d48902f9fab2fdc4d15850ffee3d6860f550bcb4 /indra/llwindow/llwindowheadless.cpp | |
parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
parent | 798377b076fbce895ba2075417107de0da10b9ca (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llwindow/llwindowheadless.cpp')
-rw-r--r-- | indra/llwindow/llwindowheadless.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp index e6e6bc67ff..dbdb40f5b9 100644 --- a/indra/llwindow/llwindowheadless.cpp +++ b/indra/llwindow/llwindowheadless.cpp @@ -35,7 +35,7 @@ // LLWindowHeadless::LLWindowHeadless(LLWindowCallbacks* callbacks, const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height, U32 flags, BOOL fullscreen, BOOL clear_background, - BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth) + BOOL disable_vsync, BOOL ignore_pixel_depth) : LLWindow(callbacks, fullscreen, flags) { // Initialize a headless keyboard. |