diff options
author | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
commit | a359d9d80c013b7c6cd594bb8d94b8950fdcdf55 (patch) | |
tree | 7b687542962149ec448d436dbe62fe8ebac25d63 /indra/newview/llappviewer.h | |
parent | f46e07c14c11ffd26c0cf0794992d7c08d16fcd4 (diff) | |
parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) |
merge changes for 3.6.4-release
Diffstat (limited to 'indra/newview/llappviewer.h')
-rwxr-xr-x | indra/newview/llappviewer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index f16451aca2..3ae8a78845 100755 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -32,6 +32,7 @@ #include "llsys.h" // for LLOSInfo #include "lltimer.h" #include "llappcorehttp.h" +#include <boost/optional.hpp> class LLCommandLineParser; class LLFrameTimer; @@ -261,7 +262,7 @@ private: bool mSavedFinalSnapshot; bool mSavePerAccountSettings; // only save per account settings if login succeeded - bool mForceGraphicsDetail; + boost::optional<U32> mForceGraphicsLevel; bool mQuitRequested; // User wants to quit, may have modified documents open. bool mLogoutRequestSent; // Disconnect message sent to simulator, no longer safe to send messages to the sim. |