diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-01-15 16:42:39 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-01-15 16:42:39 -0500 |
commit | 3612d7d14b1e481402bb3d7cbfb552cd19a3fc0a (patch) | |
tree | f3dabe49f7953e24de207a6a0939da5539d5acca /indra/newview/llappviewer.cpp | |
parent | a6c8de97bbb2609d24e212672b192650aed91e1e (diff) | |
parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rwxr-xr-x | indra/newview/llappviewer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a5f289dc8a..b74b4885d9 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -330,7 +330,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; // VFS globals - see llappviewer.h LLVFS* gStaticVFS = NULL; |