diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-09 13:19:46 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-09 13:19:46 +0000 |
| commit | d0d1534e34a544a2a2acc9993421f587bb4f6ede (patch) | |
| tree | 99eb3d9b83bcbcaaedf3413aa2eecbf3cf329fbe /indra/test_apps | |
| parent | df50590145a835531a9539a96e8349f910161f53 (diff) | |
| parent | 7b029036339ae1770307ff33ccd5d540e2618748 (diff) | |
merge from viewer-2-0
Diffstat (limited to 'indra/test_apps')
| -rw-r--r-- | indra/test_apps/llplugintest/llmediaplugintest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 6b275bbcad..e5a846f15a 100644 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -307,7 +307,7 @@ GLfloat LLMediaPluginTest::distanceToCamera( GLfloat point_x, GLfloat point_y, G GLdouble modelMatrix[16]; GLdouble projMatrix[16]; - int viewport[4]; + GLint viewport[4]; glGetDoublev(GL_MODELVIEW_MATRIX, modelMatrix); glGetDoublev(GL_PROJECTION_MATRIX, projMatrix); |