diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-13 15:26:50 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-13 15:26:50 -0400 |
| commit | 5341e1d389068f6f8b3d4b47a12270a95e154176 (patch) | |
| tree | 1de7a5551953172b1bb87cf1931890e6fdde91b2 /indra/newview/llviewermenu.cpp | |
| parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) | |
| parent | c591146b482e9c155edfd9ad58194413da45451b (diff) | |
merge up to 3.7.18
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 38aaff9279..cd1857339c 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 { |