Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

2012-02-17 15:59:16 +01:00
parent 86cafba0df 42518dbfaa
commit dbc3a8c65f
2 changed files with 15 additions and 3 deletions
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -45,6 +45,7 @@
 #include "llgl.h"
 #include "lldrawable.h"
 #include "llrendertarget.h"
+#include "llfasttimer.h"

 #include <stack>