diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-04-03 20:49:26 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-04-03 20:49:26 -0700 |
| commit | 7bd15e59175fcb11ea620459db600ca018707d38 (patch) | |
| tree | 69a45d4ed8ec11243ded23fc0c265325977929a6 /indra/newview/llvovolume.cpp | |
| parent | f189ba4a3d927fe0ecfb83b36b60a47c88525fdd (diff) | |
NORSPEC-23 NORSPEC-76 NORSPEC-37 and other stability improvements
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 43c57602f5..b65663140d 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1977,7 +1977,7 @@ void LLVOVolume::setTEMaterialParamsCallback(const LLMaterialID &pMaterialID, co { for (U8 i = 0; i < getNumTEs(); i++) { - if (getTE(i)->getMaterialID() == pMaterialID) + if (getTE(i) && (getTE(i)->getMaterialID().isNull() || (getTE(i)->getMaterialID() == pMaterialID))) { setTEMaterialParams(i, pMaterialParams); } |