diff options
| author | Anders Arnholm | 2008-12-15 14:28:30 +0100 |
|---|---|---|
| committer | Anders Arnholm | 2008-12-15 14:28:30 +0100 |
| commit | 4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a (patch) | |
| tree | b8ce0209ceec80e33d1781d89e77c71a5058af7d /linden/indra/newview/llviewerwindow.cpp | |
| parent | .. (diff) | |
| parent | Version string generator now includes test label. (diff) | |
| download | meta-impy-4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a.zip meta-impy-4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a.tar.gz meta-impy-4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a.tar.bz2 meta-impy-4f0e669d95e61dd34696f8a3214b6acdc7aa6e1a.tar.xz | |
Merge branch 'next' of git://github.com/jacek/imprudence into next
Conflicts:
ChangeLog.txt
linden/indra/llcommon/llversionviewer.h
Diffstat (limited to 'linden/indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | linden/indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index 64c042a..2e77316 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp | |||
| @@ -470,7 +470,7 @@ public: | |||
| 470 | ypos += y_inc; | 470 | ypos += y_inc; |
| 471 | } | 471 | } |
| 472 | // only display these messages if we are actually rendering beacons at this moment | 472 | // only display these messages if we are actually rendering beacons at this moment |
| 473 | if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconAlwaysOn")) | 473 | if (LLPipeline::getRenderBeacons(NULL) && gSavedSettings.getBOOL("BeaconsEnabled")) |
| 474 | { | 474 | { |
| 475 | if (LLPipeline::getRenderParticleBeacons(NULL)) | 475 | if (LLPipeline::getRenderParticleBeacons(NULL)) |
| 476 | { | 476 | { |