diff options
| author | simon <none@none> | 2014-03-26 10:04:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-26 10:04:53 -0700 |
| commit | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (patch) | |
| tree | 5dfdbcede0d8c689e796cf65ebc21bb149c17b8e /indra/newview/llviewerwindow.cpp | |
| parent | 00a325ccb90b1c6800ec78e1211b5097d9c27a58 (diff) | |
| parent | 5c20e06dbd0845e2d45daae610c43fc89e24028f (diff) | |
Pull in downstream -bear, viewer-release and become version 3.7.5
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index be4af23d07..bef032a404 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -438,10 +438,7 @@ public: } if (gDisplayWindInfo) { - if (gAudiop) - { - audio_text= llformat("Audio for wind: %d", gAudiop->isWindEnabled()); - } + audio_text = llformat("Audio for wind: %d", gAudiop ? gAudiop->isWindEnabled() : -1); addText(xpos, ypos, audio_text); ypos += y_inc; } if (gDisplayFOV) |