Merge branch 'animesh' of git://github.com/Shyotl/SingularityViewer into animesh

2019-04-09 02:30:24 -04:00
parent 181c6ddd9d 8ed9934a87
commit 1ef5dc2c5d
9 changed files with 24 additions and 25 deletions
--- a/indra/llmath/llvolumemgr.cpp
+++ b/indra/llmath/llvolumemgr.cpp
@@ -27,6 +27,7 @@

 #include "llvolumemgr.h"
 #include "llvolume.h"
+#include "llthread.h"


 const F32 BASE_THRESHOLD = 0.03f;
--- a/indra/llmath/llvolumemgr.h
+++ b/indra/llmath/llvolumemgr.h
@@ -31,7 +31,6 @@

 #include "llvolume.h"
 #include "llpointer.h"
-#include "llthread.h"

 class LLVolumeParams;
 class LLVolumeLODGroup;