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

This commit is contained in:
Siana Gearz
2011-11-23 23:21:14 +01:00
83 changed files with 1463 additions and 1258 deletions

View File

@@ -213,7 +213,7 @@ void LLNetMap::draw()
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
LLLocalClipRect clip(getLocalRect());
glMatrixMode(GL_MODELVIEW);
gGL.matrixMode(LLRender::MM_MODELVIEW);
// Draw background rectangle
if(isBackgroundVisible())