Merge branch 'master' into llwebprofile

This commit is contained in:
Aleric Inglewood
2012-12-14 20:43:17 +01:00
329 changed files with 10206 additions and 6883 deletions

View File

@@ -453,7 +453,7 @@ protected:
class LLDebugText* mDebugText; // Internal class for debug text
bool mResDirty;
bool mStatesDirty;
//bool mStatesDirty; //Singu Note: No longer needed. State update is now in restoreGL.
bool mIsFullscreenChecked; // Did the user check the fullscreen checkbox in the display settings
U32 mCurrResolutionIndex;