diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-07-13 10:44:40 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-07-13 10:44:40 -0400 |
| commit | cd1c64d68986a9d6ce2f41cd00a720681b738013 (patch) | |
| tree | d064cccb72bdc03b888075d06a30b2ab3d244442 /indra/llcommon | |
| parent | f868e29945806fd6cefde65067ae2c870ac112a6 (diff) | |
| parent | b031b1a6255af0813698bd40586f30f7b0a76f58 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llapp.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index d9933b3d36..ff9a92b45f 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -172,12 +172,12 @@ public: virtual bool cleanup() = 0; // Override to do application cleanup // - // mainLoop() + // frame() // - // Runs the application main loop. It's assumed that when you exit - // this method, the application is in one of the cleanup states, either QUITTING or ERROR + // Pass control to the application for a single frame. Returns 'done' + // flag: if frame() returns false, it expects to be called again. // - virtual bool mainLoop() = 0; // Override for the application main loop. Needs to at least gracefully notice the QUITTING state and exit. + virtual bool frame() = 0; // Override for application body logic // // Crash logging |