newview V3 partial merge.

2011-08-30 01:05:59 -05:00
parent 8d23a7d1d4
commit fd317a4092
29 changed files with 390 additions and 350 deletions
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -59,7 +59,7 @@ class LLVolumeTriangle;
 #include "llquaternion.h"
 #include "llstrider.h"
 #include "v4coloru.h"
-#include "llmemory.h"
+#include "llrefcount.h"
 #include "llfile.h"

 //============================================================================