diff options
| author | Dave Parks <davep@lindenlab.com> | 2014-06-19 13:14:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2014-06-19 13:14:42 -0500 |
| commit | d0428575fb9c3d285dc32e61808a877cb24efa89 (patch) | |
| tree | 79e7ad754a5e449b66979f71146f4e8537cf69fb /indra/newview/llviewermenu.cpp | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
| parent | e43f43b4d9dbcaeb20884772b3fcba6df5e9a62c (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-release
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 b23e23f32e..3243b94ed3 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7187,7 +7187,7 @@ class LLAdvancedClickRenderProfile: public view_listener_t } }; -void gpu_benchmark(); +F32 gpu_benchmark(); class LLAdvancedClickRenderBenchmark: public view_listener_t { |