diff options
author | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2010-02-28 20:55:58 +0800 |
commit | 1df1be10afd14fe80d491617e175f4586a78f71f (patch) | |
tree | 6e7a55591c2166ae732a7854f329e9bfd800546b /indra/newview/tests | |
parent | 75e5441f2da7252749174db70719a78637bc4eeb (diff) | |
parent | b20307a683073c415804966ed5b363fb68879ee5 (diff) |
merge
Diffstat (limited to 'indra/newview/tests')
-rw-r--r-- | indra/newview/tests/llviewerhelputil_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp index dd61ac6ae5..eecc79d36c 100644 --- a/indra/newview/tests/llviewerhelputil_test.cpp +++ b/indra/newview/tests/llviewerhelputil_test.cpp @@ -86,7 +86,7 @@ public: #ifdef __GNUC__ __attribute__ ((noinline)) #endif - BOOL isGodlike() const { return FALSE; } + bool isGodlike() const { return FALSE; } }; LLAgent gAgent; |