summaryrefslogtreecommitdiff
path: root/indra/test
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 15:22:34 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 15:22:34 -0400
commit7203162071163108cbbb18f90ddb7f5d6734f8bd (patch)
tree698966629d29e71f77777c75331aeac272e0371a /indra/test
parent31d3d654f156351e3cf29f97fd97cbda046ae650 (diff)
parent1bbc523b048628630e0a45f67f15cdf39cb138d9 (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
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()