summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-07-13 10:44:40 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-07-13 10:44:40 -0400
commitcd1c64d68986a9d6ce2f41cd00a720681b738013 (patch)
treed064cccb72bdc03b888075d06a30b2ab3d244442 /indra/test
parentf868e29945806fd6cefde65067ae2c870ac112a6 (diff)
parentb031b1a6255af0813698bd40586f30f7b0a76f58 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/test')
-rw-r--r--indra/test/llapp_tut.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/test/llapp_tut.cpp b/indra/test/llapp_tut.cpp
index aa5c0672e6..98e714a497 100644
--- a/indra/test/llapp_tut.cpp
+++ b/indra/test/llapp_tut.cpp
@@ -41,7 +41,7 @@ namespace tut
public:
virtual bool init() { return true; }
virtual bool cleanup() { return true; }
- virtual bool mainLoop() { return true; }
+ virtual bool frame() { return true; }
};
LLTestApp* mApp;
application()