Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into renderer32

Browse Source
This commit is contained in:
Siana Gearz
2011-11-23 23:21:14 +01:00
parent f0108c17b9 e46c906a8b
commit b8eb3076ce
83 changed files with 1463 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llagent.cpp
View File

@@ -4078,14 +4078,14 @@ void LLAgent::renderAutoPilotTarget()
F32 height_meters;
LLVector3d target_global;
glMatrixMode(GL_MODELVIEW);
gGL.matrixMode(LLRender::MM_MODELVIEW);
gGL.pushMatrix();
// not textured
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
// lovely green
glColor4f(0.f, 1.f, 1.f, 1.f);
gGL.diffuseColor4f(0.f, 1.f, 1.f, 1.f);
target_global = mAutoPilotTargetGlobal;
@@ -4093,7 +4093,7 @@ void LLAgent::renderAutoPilotTarget()
height_meters = 1.f;
glScalef(height_meters, height_meters, height_meters);
gGL.scalef(height_meters, height_meters, height_meters);
gSphere.render(1500.f);