livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Liny 2014-05-20 12:39:30 -07:00
parent 9f625756b6 bfcca01e5c
commit 2067c67249
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llwindow/llwindowmacosx.cpp
View File

@ -117,10 +117,10 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
BOOL fullscreen, BOOL clearBg,
BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth,
/*U32 fsaa_samples,) // <FS:LO> Legacy cursor setting from main program
: LLWindow(NULL, fullscreen, flags)*/
U32 fsaa_samples, BOOL useLegacyCursors)
: LLWindow(NULL, fullscreen, flags), mUseLegacyCursors(useLegacyCursors)
//U32 fsaa_samples,) // <FS:LO> Legacy cursor setting from main program
U32 fsaa_samples,
BOOL useLegacyCursors)
: LLWindow(NULL, fullscreen, flags)
{
// *HACK: During window construction we get lots of OS events for window
// reshape, activate, etc. that the viewer isn't ready to handle.