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/pipeline.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 'linden/indra/newview/pipeline.cpp')
| -rw-r--r-- | linden/indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index f232fdf..3523635 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
| @@ -2101,7 +2101,7 @@ void LLPipeline::postSort(LLCamera& camera) | |||
| 2101 | } | 2101 | } |
| 2102 | 2102 | ||
| 2103 | // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus | 2103 | // only render if the flag is set. The flag is only set if we are in edit mode or the toggle is set in the menus |
| 2104 | if (gSavedSettings.getBOOL("BeaconAlwaysOn")) | 2104 | if (gSavedSettings.getBOOL("BeaconsEnabled")) |
| 2105 | { | 2105 | { |
| 2106 | if (sRenderScriptedTouchBeacons) | 2106 | if (sRenderScriptedTouchBeacons) |
| 2107 | { | 2107 | { |