diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/llwindow/llwindowmacosx.h | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 0534893aa7..171ec9864a 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -120,7 +120,7 @@ public: protected: LLWindowMacOSX( - char *title, char *name, int x, int y, int width, int height, U32 flags, + const char *title, const char *name, int x, int y, int width, int height, U32 flags, BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth, U32 fsaa_samples); @@ -203,6 +203,8 @@ protected: LangCode mTSMLangCode; LLPreeditor* mPreeditor; + static BOOL sUseMultGL; + friend class LLWindowManager; }; |