diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
| commit | b9b4a4d9347053a3834ca2928063136948f09d1d (patch) | |
| tree | c2affaf017c2967989ff0b4a2b125d348736a04a /indra/newview/pipeline.cpp | |
| parent | 0a3b9e8e141a6f38ecbdf6020312e7a89b153bc4 (diff) | |
QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7269e32d71..36035f165b 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -211,7 +211,6 @@ BOOL LLPipeline::sRenderParticleBeacons = FALSE; BOOL LLPipeline::sRenderSoundBeacons = FALSE; BOOL LLPipeline::sRenderBeacons = FALSE; BOOL LLPipeline::sRenderHighlight = TRUE; -BOOL LLPipeline::sRenderProcessBeacons = FALSE; S32 LLPipeline::sUseOcclusion = 0; BOOL LLPipeline::sFastAlpha = TRUE; BOOL LLPipeline::sDisableShaders = FALSE; @@ -2084,8 +2083,8 @@ void LLPipeline::postSort(LLCamera& camera) std::sort(sCull->beginAlphaGroups(), sCull->endAlphaGroups(), LLSpatialGroup::CompareDepthGreater()); } - // only render if the flag is set. The flag is only set if the right key is pressed, we are in edit mode or the toggle is set in the menus - if (sRenderProcessBeacons) + // 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 + if (gSavedSettings.getBOOL("BeaconAlwaysOn")) { if (sRenderScriptedTouchBeacons) { @@ -3969,12 +3968,6 @@ BOOL LLPipeline::getRenderHighlights(void*) return sRenderHighlight; } -// static -BOOL LLPipeline::getProcessBeacons(void* data) -{ - return sRenderProcessBeacons; -} - LLViewerObject* LLPipeline::lineSegmentIntersectInWorld(const LLVector3& start, const LLVector3& end, S32* face_hit, LLVector3* intersection, // return the intersection point |