diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-11-26 11:40:32 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-11-26 11:40:32 -0500 |
commit | e345cfbe55f8a530432780b03ff78b4edae6e036 (patch) | |
tree | 7b1f14c30834f14cc1bff9e3f9da101f39135b33 /indra/newview/llviewermenu.cpp | |
parent | c7c549b7e24af3b9ee87d464a03adeab75ee6553 (diff) | |
parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rwxr-xr-x | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 01a36597e6..302dd6f889 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7229,7 +7229,7 @@ class LLAdvancedClickRenderProfile: public view_listener_t } }; -void gpu_benchmark(); +F32 gpu_benchmark(); class LLAdvancedClickRenderBenchmark: public view_listener_t { |