diff options
| author | McCabe Maxsted | 2008-11-24 11:42:30 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-13 22:25:50 -0600 |
| commit | 0b1b08da1b7cf8f3dc43b295ec35d3f873e9a2da (patch) | |
| tree | c37a1fe2f0b3e6d8b3f01a77078d64b168398d31 /linden/indra/newview/pipeline.cpp | |
| parent | Moved 'Offer Teleport' in IM to be on the left side. (diff) | |
| download | meta-impy-0b1b08da1b7cf8f3dc43b295ec35d3f873e9a2da.zip meta-impy-0b1b08da1b7cf8f3dc43b295ec35d3f873e9a2da.tar.gz meta-impy-0b1b08da1b7cf8f3dc43b295ec35d3f873e9a2da.tar.bz2 meta-impy-0b1b08da1b7cf8f3dc43b295ec35d3f873e9a2da.tar.xz | |
Beacons no longer persist between sessions.
That distressed users who accidentally enabled them,
since not even relogging would disable them.
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 | { |