summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.h
diff options
context:
space:
mode:
authorsimon <none@none>2013-08-26 15:45:09 -0700
committersimon <none@none>2013-08-26 15:45:09 -0700
commit90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (patch)
tree8d5afd9678fd44444bcc7b5d311b5cfb7abe5217 /indra/newview/llappviewer.h
parentac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (diff)
parent27d637d0f14fdfff496256222dc1343d2d7ee9ae (diff)
Merge downstream code for CHUIStorm
Diffstat (limited to 'indra/newview/llappviewer.h')
-rwxr-xr-xindra/newview/llappviewer.h3
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.