summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2014-11-11 02:32:39 +0200
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2014-11-11 02:32:39 +0200
commitfa9097b65f9d89fd0c8bf7b32924f0327a617cdc (patch)
tree08a3eb3d997080527f093b56c5af2923855fbac3 /indra/newview/llviewermenu.cpp
parenta669303f8528639b539a793c1dc2d8572beefe80 (diff)
parent2301cf800f40101baed7a5936683d0b1e4968be1 (diff)
Merge changes for 3.7.20-release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rwxr-xr-xindra/newview/llviewermenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index faf929d8f9..3abeba4b43 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
{