Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal

Conflicts: indra/newview/llnetmap.cpp - Thankies Shyotl~
2014-07-21 23:31:59 -04:00
parent 8159eff664 cd85afc9a5
commit 5191baa659
111 changed files with 2419 additions and 3960 deletions
--- a/indra/llmath/llplane.h
+++ b/indra/llmath/llplane.h
@@ -101,7 +101,7 @@ public:
 	}

 private:
-	LLVector4a mV;
+	LL_ALIGN_16(LLVector4a mV);
 } LL_ALIGN_POSTFIX(16);