summaryrefslogtreecommitdiff
path: root/indra/newview/llspatialpartition.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-04-10 00:28:03 -0500
committerDave Parks <davep@lindenlab.com>2013-04-10 00:28:03 -0500
commitaaad46c18b2b49a06cec65afdb0077690f6e80a7 (patch)
tree4ef932374ddce8c66847597f7ea33b9add75492d /indra/newview/llspatialpartition.cpp
parent8f84d75ae42f4bb6f3305c64e95bc4a070b774a6 (diff)
parent78d23e66425265e43584c6c4fd4fce9c675f4771 (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
-rw-r--r--indra/newview/llspatialpartition.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 7ec0d7df58..f42586c715 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -4639,6 +4639,7 @@ LLDrawInfo::LLDrawInfo(U16 start, U16 end, U32 count, U32 offset,
mFace(NULL),
mDistance(0.f),
mDrawMode(LLRender::TRIANGLES),
+ mMaterial(NULL),
mSpecColor(1.0f, 1.0f, 1.0f, 0.5f),
mEnvIntensity(0.0f),
mAlphaMaskCutoff(0.5f),