summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-08-17 11:41:12 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-08-17 11:41:12 -0400
commite72bdc9bc5895267f77bf3eac8d68f82f5e2806b (patch)
treebb86f9ae3e199a994ec5e2255d9af0de3fa17c95 /indra/test
parent4fb100ac7a33174883184f1320d0beac08ead3a7 (diff)
parent5e9d2f57c82a57307a48afea09aa539b9fa80abf (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()