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

General cleanup

Browse Source
This commit is contained in:
Shyotl
2011-05-12 18:55:26 -05:00
parent f45c3e2b1f
commit 9e2db6bc40
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llflexibleobject.cpp
View File

@@ -39,7 +39,6 @@
#include "llglheaders.h" #include "llglheaders.h"
#include "llrendersphere.h" #include "llrendersphere.h"
#include "llviewerobject.h" #include "llviewerobject.h"
#include "llimagegl.h"
#include "llagent.h" #include "llagent.h"
#include "llsky.h" #include "llsky.h"
#include "llviewercamera.h" #include "llviewercamera.h"

1
indra/newview/llhudobject.h
View File

@@ -106,7 +106,6 @@ protected:
~LLHUDObject(); ~LLHUDObject();
virtual void render() = 0; virtual void render() = 0;
virtual void renderForSelect() {};
virtual void renderForTimer() {}; virtual void renderForTimer() {};
protected: protected:

1
indra/newview/llhudrender.cpp
View File

@@ -40,7 +40,6 @@
#include "v3math.h" #include "v3math.h"
#include "llquaternion.h" #include "llquaternion.h"
#include "llfontgl.h" #include "llfontgl.h"
#include "llimagegl.h"
#include "llglheaders.h" #include "llglheaders.h"
#include "llviewerwindow.h" #include "llviewerwindow.h"

1
indra/newview/llhudtext.cpp
View File

@@ -45,7 +45,6 @@
#include "llfontgl.h" #include "llfontgl.h"
#include "llglheaders.h" #include "llglheaders.h"
#include "llhudrender.h" #include "llhudrender.h"
#include "llimagegl.h"
#include "llui.h" #include "llui.h"
#include "llviewercamera.h" #include "llviewercamera.h"
#include "llviewertexturelist.h" #include "llviewertexturelist.h"

12
indra/newview/llselectmgr.cpp
View File

@@ -4917,13 +4917,13 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
// set up transform to encompass bounding box of HUD // set up transform to encompass bounding box of HUD
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); gGL.pushMatrix();
glLoadIdentity(); glLoadIdentity();
F32 depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f); F32 depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f);
glOrtho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, depth); glOrtho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, depth);
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glPushMatrix(); gGL.pushMatrix();
glLoadIdentity(); glLoadIdentity();
glLoadMatrixf(OGL_TO_CFR_ROTATION); // Load Cory's favorite reference frame glLoadMatrixf(OGL_TO_CFR_ROTATION); // Load Cory's favorite reference frame
glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (depth *0.5f), 0.f, 0.f); glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (depth *0.5f), 0.f, 0.f);
@@ -5007,10 +5007,10 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
if (isAgentAvatarValid() && for_hud) if (isAgentAvatarValid() && for_hud)
{ {
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPopMatrix(); gGL.popMatrix();
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glPopMatrix(); gGL.popMatrix();
stop_glerror(); stop_glerror();
} }
@@ -5349,7 +5349,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
} }
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glPushMatrix(); gGL.pushMatrix();
if (!is_hud_object) if (!is_hud_object)
{ {
glLoadIdentity(); glLoadIdentity();
@@ -5468,7 +5468,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
gGL.end(); gGL.end();
gGL.flush(); gGL.flush();
} }
glPopMatrix(); gGL.popMatrix();
} }
// //