diff options
| author | simon <none@none> | 2014-04-21 13:04:07 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 13:04:07 -0700 |
| commit | fdb28bccb92d121f1b3dfc068a50d5cc3db43ce9 (patch) | |
| tree | 391f32cc407d6e9c14bd4804b7ece4f53df3250c /indra/newview/llstartup.cpp | |
| parent | 80eafe2ff3b235b6355ae2f20e8301374623e6ea (diff) | |
| parent | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rwxr-xr-x | indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 6d2ae7c3e1..3427fc10fc 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2684,7 +2684,7 @@ void init_start_screen(S32 location_id) } } - if(gStartTexture && gStartTexture.isNull()) + if(gStartTexture.isNull()) { gStartTexture = LLViewerTexture::sBlackImagep ; gStartImageWidth = gStartTexture->getWidth() ; |