summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-08-29 17:06:12 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-08-29 17:06:12 -0400
commit6b24122857583537495a01f408c6c303f93adb02 (patch)
tree382a25e202c5fd171dcb01fb3e82bbb12781540e /indra/test
parent3d9c39c77cd4e4e8da8abf9234f1c751762985e6 (diff)
parent20cf275d21c0dce569bb3a16393b529c5c9f1c6c (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
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()