diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:28:47 -0800 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:28:47 -0800 |
| commit | 13ec15beb948f0036ea281a5bee25355b5d5478b (patch) | |
| tree | b6aa41aca034f1ffb65c619a0da843f8d9d46163 /indra/newview/llappviewer.cpp | |
| parent | 8d884c343669d884c2f9eb7485a77fdf9a83ce5d (diff) | |
| parent | c703b2c038c369807218f61b7e90e7134da390f5 (diff) | |
Automated merge with head of callum_linden/viewer64-callum
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; |