Trival V3 llmath merge.

2012-05-21 20:23:42 -05:00
parent 9eda9ad462
commit ae0804beea
16 changed files with 158 additions and 139 deletions
--- a/indra/llwindow/llwindowcallbacks.cpp
+++ b/indra/llwindow/llwindowcallbacks.cpp
@@ -28,8 +28,6 @@

 #include "llwindowcallbacks.h"

-#include "llcoord.h"
-
 //
 // LLWindowCallbacks
 //
--- a/indra/llwindow/llwindowcallbacks.h
+++ b/indra/llwindow/llwindowcallbacks.h
@@ -26,7 +26,7 @@
 #ifndef LLWINDOWCALLBACKS_H
 #define LLWINDOWCALLBACKS_H

-class LLCoordGL;
+#include "llcoord.h"
 class LLWindow;

 class LLWindowCallbacks