diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-24 06:56:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-24 06:56:57 -0500 |
| commit | b69be18d7b41b639d3c62354ca7ab6e3bc32f1cb (patch) | |
| tree | 355347be68e29f59ad5299abd9b42423359eb60e /indra/newview/llfasttimerview.cpp | |
| parent | fb605a047aa1c6b293b9546a06ac800c53d109ba (diff) | |
| parent | 8c86a08e72708e96dcf67830518187a00478bbfd (diff) | |
merge changes for vmrg-193
Diffstat (limited to 'indra/newview/llfasttimerview.cpp')
| -rw-r--r-- | indra/newview/llfasttimerview.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index a161428c2b..065dc5f4be 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -1125,10 +1125,10 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t LLPointer<LLImageRaw> scratch = new LLImageRaw(1024, 512, 3); gGL.pushMatrix(); - glLoadIdentity(); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(-0.05, 1.05, -0.05, 1.05, -1.0, 1.0); + gGL.loadIdentity(); + gGL.matrixMode(LLRender::MM_PROJECTION); + gGL.loadIdentity(); + gGL.ortho(-0.05f, 1.05f, -0.05f, 1.05f, -1.0f, 1.0f); //render charts gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); @@ -1367,7 +1367,7 @@ void LLFastTimerView::exportCharts(const std::string& base, const std::string& t buffer.flush(); gGL.popMatrix(); - glMatrixMode(GL_MODELVIEW); + gGL.matrixMode(LLRender::MM_MODELVIEW); gGL.popMatrix(); } |
