diff options
| author | unknown | 2008-12-19 00:17:06 -0700 |
|---|---|---|
| committer | unknown | 2008-12-19 00:17:06 -0700 |
| commit | e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554 (patch) | |
| tree | f4ae195b239b9ae3ed8ca53c2dc6f20a24ff7dc7 /linden/indra/newview/pipeline.cpp | |
| parent | fuckyougit (diff) | |
| parent | 1.1 wip copy (diff) | |
| download | meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.zip meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.gz meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.bz2 meta-impy-e9d5b0c2063e017fb4d4e3b0a106c08a9dbdc554.tar.xz | |
resolved merge conflicts
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 | { |