From de78dbf671ee0766c84f8b84cce9e0c809e2d15f Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Wed, 11 Jan 2017 02:25:05 +0100
Subject: [PATCH] Post merge sweep.

---
 indra/newview/llviewerwindow.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 64876b0750..2ef8ec004d 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -789,7 +789,7 @@ public:
 			ypos += y_inc;
 		}
 		// <FS:LO> pull the text saying if particles are hidden out from beacons
-		if (LLPipeline::toggleRenderTypeControlNegated((void*)LLPipeline::RENDER_TYPE_PARTICLES))
+		if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES))
 		{
 			addText(xpos, ypos, particle_hiding);
 			ypos += y_inc;
@@ -801,7 +801,7 @@ public:
 		// <FS:Ansa> ...and if we want to see it
 		//if (LLPipeline::getRenderBeacons(NULL) && LLFloaterReg::instanceVisible("beacons"))
 		static LLCachedControl<bool> fsRenderBeaconText(gSavedSettings, "FSRenderBeaconText");
-		if (LLPipeline::getRenderBeacons(NULL) && fsRenderBeaconText)
+		if (LLPipeline::getRenderBeacons() && fsRenderBeaconText)
 		// </FS:Ansa>
 		{
 			if (LLPipeline::getRenderMOAPBeacons())
@@ -812,13 +812,11 @@ public:
 				ypos += y_inc;
 			}
 
-			// <FS:LO> pull the text saying if particles are hidden out from beacons
 			if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES))
 			{
 				addText(xpos, ypos, particle_hiding);
 				ypos += y_inc;
-			}*/
-			// </FS:LO>
+			}
 
 			if (LLPipeline::getRenderParticleBeacons())
 			{