livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Post merge sweep.

meow-7.2.2
Nicky 2017-01-11 02:25:05 +01:00
parent 29543e2572
commit de78dbf671
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewerwindow.cpp
View File

@ -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())
{