diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-07 12:17:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-07 12:17:39 -0400 |
| commit | 86b4019684af96a64a1d439851f177d7c18e4c24 (patch) | |
| tree | 45a8166a884811d81d4d0e6189514378ca1661ce /indra/newview/llappviewer.h | |
| parent | cfd80c02c317591b7a52f719e3560de8912660b5 (diff) | |
| parent | f4943bb2e6d59103d6e6a511ff8f06adb1c90a41 (diff) | |
merge changes for DRTVWR-333
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 cd91ae8b2b..3af360b529 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; @@ -258,7 +259,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. |