diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-17 09:43:08 -0800 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-17 09:43:08 -0800 |
| commit | bf90329dea911174ba49d0e897c55535973f63ad (patch) | |
| tree | c0037baed83a0ce8c53b0d0991fb2b6fc06fda04 /indra/newview/llappviewer.cpp | |
| parent | 9472098e81b3381803237d2a87a4c5de6164b48d (diff) | |
| parent | c5ac455647dad3158b284fc9bb33dbc1d63928db (diff) | |
Automated merge with head of lindenlab/callum_viewer64
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ed86145e10..65c3e70b66 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -334,10 +334,10 @@ BOOL gDisconnected = FALSE; // used to restore texture state after a mode switch LLFrameTimer gRestoreGLTimer; BOOL gRestoreGL = FALSE; -BOOL gUseWireframe = FALSE; +bool gUseWireframe = FALSE; //use for remember deferred mode in wireframe switch -BOOL gInitialDeferredModeForWireframe = FALSE; +bool gInitialDeferredModeForWireframe = FALSE; // VFS globals - see llappviewer.h LLVFS* gStaticVFS = NULL; |