diff options
| author | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
| commit | a3b0b6c299f791b3d8132d36a3d4c1790aea86b1 (patch) | |
| tree | 07d9080e0f71845fdf07f666907422b2fe6c4a3f /linden/indra/newview/llviewerwindow.cpp | |
| parent | Use NType to find inventory icon name (part 2 of 2). (diff) | |
| parent | VWR-1582: Local ruler mode wrong for linked objects. (diff) | |
| download | meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.zip meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.gz meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.bz2 meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.xz | |
Merge 1.1.0 alpha into quickfilter
Diffstat (limited to '')
| -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 | { |