diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-03-05 16:31:29 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-03-05 16:31:29 -0500 |
| commit | 18687a365245122fd74829fc0b735931d2d7d0e0 (patch) | |
| tree | c58feb68bb0527380375d2542c48ad18642bf7fd /indra/test_apps | |
| parent | b70951ca1e319e4d4a427a559072ee722588e1ed (diff) | |
| parent | 65ecde210e24a691190444e88090c0cd3c2d9559 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/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); |