summaryrefslogtreecommitdiff
path: root/indra/test_apps/llplugintest/llmediaplugintest.cpp
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-03-05 14:44:30 -0800
committerEli Linden <eli@lindenlab.com>2010-03-05 14:44:30 -0800
commitf0ea8083ebf207d00c043dd35eddf5ab55e71c0d (patch)
tree0c0d5f207d7aea65a17f0cf92cb8951c3a557def /indra/test_apps/llplugintest/llmediaplugintest.cpp
parenta714e9ed7eaad7ae2da6dd1fb131bd4aed0eea59 (diff)
parent18687a365245122fd74829fc0b735931d2d7d0e0 (diff)
Merge
Diffstat (limited to 'indra/test_apps/llplugintest/llmediaplugintest.cpp')
-rw-r--r--indra/test_apps/llplugintest/llmediaplugintest.cpp2
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);