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/llwindow.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/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index 7a7c14fa35..9fc91d3643 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -325,8 +325,8 @@ class LLWindowManager { public: static LLWindow* createWindow( - char *title, - char *name, + const char *title, + const char *name, LLCoordScreen upper_left = LLCoordScreen(10, 10), LLCoordScreen size = LLCoordScreen(320, 240), U32 flags = 0, @@ -336,7 +336,7 @@ public: BOOL use_gl = TRUE, BOOL ignore_pixel_depth = FALSE); static LLWindow *createWindow( - char* title, char* name, S32 x, S32 y, S32 width, S32 height, + const char* title, const char* name, S32 x, S32 y, S32 width, S32 height, U32 flags = 0, BOOL fullscreen = FALSE, BOOL clearBg = FALSE, |