diff options
| author | McCabe Maxsted | 2010-06-02 02:34:29 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:43:27 -0500 |
| commit | 53bc4d4f42c9928f8eef290e8f4f98daaec651ac (patch) | |
| tree | 3dd19b2c3b4a1e9735c0d36cb384343ef0885f44 /linden/indra | |
| parent | Added client identification for the Meta7 viewer (diff) | |
| download | meta-impy-53bc4d4f42c9928f8eef290e8f4f98daaec651ac.zip meta-impy-53bc4d4f42c9928f8eef290e8f4f98daaec651ac.tar.gz meta-impy-53bc4d4f42c9928f8eef290e8f4f98daaec651ac.tar.bz2 meta-impy-53bc4d4f42c9928f8eef290e8f4f98daaec651ac.tar.xz | |
Applied patch for #315 (mRawImage.notNull() crash) by Robin Cornelius
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/lldrawpoolbump.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp index ff464f7..fb7a213 100644 --- a/linden/indra/newview/lldrawpoolbump.cpp +++ b/linden/indra/newview/lldrawpoolbump.cpp | |||
| @@ -583,6 +583,11 @@ BOOL LLDrawPoolBump::bindBumpMap(LLDrawInfo& params, S32 channel) | |||
| 583 | case BE_DARKNESS: | 583 | case BE_DARKNESS: |
| 584 | if( tex ) | 584 | if( tex ) |
| 585 | { | 585 | { |
| 586 | if(tex->getID()== IMG_DEFAULT) | ||
| 587 | { | ||
| 588 | return TRUE; | ||
| 589 | } | ||
| 590 | |||
| 586 | bump = gBumpImageList.getBrightnessDarknessImage( tex, bump_code ); | 591 | bump = gBumpImageList.getBrightnessDarknessImage( tex, bump_code ); |
| 587 | } | 592 | } |
| 588 | break; | 593 | break; |