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

2016-04-03 13:22:36 -05:00
parent bd26be78a9 9fee430d7d
commit 9214750a90
596 changed files with 16286 additions and 34539 deletions
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -3577,6 +3577,7 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset,
 	mOffset(offset), 
 	mFullbright(fullbright),
 	mBump(bump),
+	mShiny(0),
 	mParticle(particle),
 	mPartSize(part_size),
 	mVSize(0.f),