diff options
| author | Richard Linden <none@none> | 2012-09-30 10:41:29 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-30 10:41:29 -0700 |
| commit | b1baf982b1bd41a150233d0a28d3601226924c65 (patch) | |
| tree | 6ec661467cac92ffae9070e2c3df9c51c614f060 /indra/llrender | |
| parent | 38354e19063478c8cda0408547ad05023b457041 (diff) | |
SH-3275 WIP Run viewer metrics for object update messages
factored out lltrace::sampler into separate file
added rudimentary lltrace support to llstatgraph
made llstatgraph use param blocks more effectively
moves initial set of stats over to lltrace
removed windows.h #defines for min and max
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglheaders.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 509de51f4d..605b424b35 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -543,6 +543,8 @@ extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange; #define WIN32_LEAN_AND_MEAN #include <winsock2.h> #include <windows.h> +#undef min +#undef max //---------------------------------------------------------------------------- #include <GL/gl.h> |