diff options
author | Rider Linden <rider@lindenlab.com> | 2016-07-21 09:08:28 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-07-21 09:08:28 -0700 |
commit | 31009296bb8658155b1622395f9a0e9eb2ab3a51 (patch) | |
tree | 4bcacc043c143079a0e70cb0aa22ad2c444674d1 /indra/newview/llappviewer.h | |
parent | d0d07ccac565632497c50510714b30503be8aa94 (diff) | |
parent | 9c49a6c91dd9b5bbe811fcd91d8992ed6bac33e7 (diff) |
Merge
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r-- | indra/newview/llappviewer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index b5e674bd7b..f7c1bb58b4 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -79,7 +79,7 @@ public: // virtual bool init(); // Override to do application initialization virtual bool cleanup(); // Override to do application cleanup - virtual bool mainLoop(); // Override for the application main loop. Needs to at least gracefully notice the QUITTING state and exit. + virtual bool frame(); // Override for application body logic // Application control void flushVFSIO(); // waits for vfs transfers to complete @@ -283,7 +283,6 @@ private: std::string mSerialNumber; bool mPurgeCache; bool mPurgeOnExit; - bool mMainLoopInitialized; LLViewerJoystick* joystick; bool mSavedFinalSnapshot; |