diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-08 14:28:31 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-08 14:28:31 -0700 |
| commit | 76001ce3f0b53391c674f315855017b78a3a2873 (patch) | |
| tree | a2c74f15dcf8c611ce87c4cb6c3a5751e9b8d9e3 /indra/test_apps | |
| parent | 40743eaf99c9cbfee08f0bb44bc7c614bc660f34 (diff) | |
| parent | 2ed83382a1dd84575536c16e248a602ba96755cd (diff) | |
Merge
Diffstat (limited to 'indra/test_apps')
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 2 | ||||
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index f668867a02..7869763302 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -283,7 +283,7 @@ void LLMediaPluginTest::bindTexture(GLuint texture, GLint row_length, GLint alig //////////////////////////////////////////////////////////////////////////////// // -bool LLMediaPluginTest::checkGLError(char *name) +bool LLMediaPluginTest::checkGLError(const char *name) { bool result = false; GLenum error = glGetError(); diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h index 2d0ba0e3f6..095a2ea3b3 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.h +++ b/indra/test_apps/llplugintest/llmediaplugintest.h @@ -87,7 +87,7 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner void mouseMove( int x, int y ); void bindTexture(GLuint texture, GLint row_length = 0, GLint alignment = 1); - bool checkGLError(char *name = "OpenGL"); + bool checkGLError(const char *name = "OpenGL"); void drawGeometry( int panel ); void startPanelHighlight( float red, float green, float blue, float line_width ); void endPanelHighlight(); |