summaryrefslogtreecommitdiff
path: root/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorTonya Souther <tonya.souther@gmail.com>2013-01-31 11:40:16 -0600
committerTonya Souther <tonya.souther@gmail.com>2013-01-31 11:40:16 -0600
commitc1b110dd1d002b2bcb340dad9350b9717e1ca325 (patch)
tree6466c6c9a1481ef1ced85d5a1a22bdd0978a11ec /indra/newview/llspatialpartition.cpp
parentd53f69b67f2aed05fd763932f25cc8b5c40ec774 (diff)
parentd1b224158da7b2e6f7329eadfbd555e9941e1bf9 (diff)
Merging in main repository.
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r--indra/newview/llspatialpartition.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 2083afdcf5..8a62f22985 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -4672,7 +4672,12 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset,
mGroup(NULL),
mFace(NULL),
mDistance(0.f),
- mDrawMode(LLRender::TRIANGLES)
+ mDrawMode(LLRender::TRIANGLES),
+ mSpecColor(1.0f, 1.0f, 1.0f, 0.5f),
+ mEnvIntensity(0.0f),
+ mAlphaMaskCutoff(0.5f),
+ mDiffuseAlphaMode(0),
+ mMaterialID(NULL)
{
mVertexBuffer->validateRange(mStart, mEnd, mCount, mOffset);