diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 15:11:15 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-03-02 15:11:15 -0700 |
| commit | 10241c5596402a145e4087c36014d84507183c32 (patch) | |
| tree | 229a96783c6534a36ce48bdb83108ce26ac24b2f /indra/newview/llappviewer.h | |
| parent | 2cad61d76ba48fe2adfda120bc21ca66166b7385 (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' v6.4.15 into DRTVWR-528
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 11432346b1..2da5a6053b 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -1,5 +1,6 @@ /** * @mainpage + * @mainpage * * This is the sources for the Second Life Viewer; * information on the open source project is at @@ -82,7 +83,7 @@ public: virtual bool frame(); // Override for application body logic // Application control - void flushVFSIO(); // waits for vfs transfers to complete + void flushLFSIO(); // waits for lfs transfers to complete void forceQuit(); // Puts the viewer into 'shutting down without error' mode. void fastQuit(S32 error_code = 0); // Shuts down the viewer immediately after sending a logout message void requestQuit(); // Request a quit. A kinder, gentler quit. @@ -378,12 +379,6 @@ extern BOOL gRestoreGL; extern bool gUseWireframe; extern bool gInitialDeferredModeForWireframe; -// VFS globals - gVFS is for general use -// gStaticVFS is read-only and is shipped w/ the viewer -// it has pre-cache data like the UI .TGAs -class LLVFS; -extern LLVFS *gStaticVFS; - extern LLMemoryInfo gSysMemory; extern U64Bytes gMemoryAllocated; |