diff options
| author | simon <none@none> | 2014-11-24 11:31:06 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-11-24 11:31:06 -0800 |
| commit | fa068dffd023f35d161753009e6079edfe2ad012 (patch) | |
| tree | 1c44c558e8a3dd21de6767eb911b6955579a266b /indra/newview/llviewermenu.cpp | |
| parent | 8cb6fe2695fae0ae37a042ff052c613702970ddd (diff) | |
| parent | 47423ad1a0d349f263ab1c2f0ceca299e418bbbc (diff) | |
Merge downstream code and become version 3.7.21
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 1a916d5942..c76e4ca46d 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7216,7 +7216,7 @@ class LLAdvancedClickRenderProfile: public view_listener_t } }; -void gpu_benchmark(); +F32 gpu_benchmark(); class LLAdvancedClickRenderBenchmark: public view_listener_t { |