diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-18 16:14:56 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-18 16:14:56 -0500 |
| commit | a9aca58eaf847bb38f93a268da3aa024b60b38ba (patch) | |
| tree | c13c80ebfb8772df870448dba707956af6f1c67c | |
| parent | b32e6e094d1a6d2843b938448eee22ad1671052c (diff) | |
SH-2508 Fix for edit/rotate ring not showing up on Radeon X1950 pro
| -rw-r--r-- | indra/newview/llcylinder.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llmaniprotate.cpp | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llcylinder.cpp b/indra/newview/llcylinder.cpp index 2adc071d7a..f353851a25 100644 --- a/indra/newview/llcylinder.cpp +++ b/indra/newview/llcylinder.cpp @@ -53,22 +53,22 @@ void LLCone::render(S32 sides) F32 a = (F32) i/sides * F_PI*2.f; F32 x = cosf(a)*0.5f; F32 y = sinf(a)*0.5f; - gGL.vertex3f(x,y,0.f); + gGL.vertex3f(x,y,-.5f); } - gGL.vertex3f(cosf(0.f)*0.5f, sinf(0.f)*0.5f, 0.f); + gGL.vertex3f(cosf(0.f)*0.5f, sinf(0.f)*0.5f, -0.5f); gGL.end(); gGL.begin(LLRender::TRIANGLE_FAN); - gGL.vertex3f(0.f, 0.f, 1.f); + gGL.vertex3f(0.f, 0.f, 0.5f); for (U32 i = 0; i < sides; i++) { F32 a = (F32) i/sides * F_PI*2.f; F32 x = cosf(a)*0.5f; F32 y = sinf(a)*0.5f; - gGL.vertex3f(x,y,0.f); + gGL.vertex3f(x,y,-0.5f); } - gGL.vertex3f(cosf(0.f)*0.5f, sinf(0.f)*0.5f, 0.f); + gGL.vertex3f(cosf(0.f)*0.5f, sinf(0.f)*0.5f, -0.5f); gGL.end(); } diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp index 19798ef752..04dd2be583 100644 --- a/indra/newview/llmaniprotate.cpp +++ b/indra/newview/llmaniprotate.cpp @@ -199,8 +199,7 @@ void LLManipRotate::render() gl_circle_2d( 0, 0, mRadiusMeters, CIRCLE_STEPS, TRUE ); } - GLdouble plane_eqn[] = { 0, 0, 1, 0 }; - glClipPlane( GL_CLIP_PLANE0, plane_eqn ); + gGL.flush(); } gGL.popMatrix(); } |