From 834d0f1ed612c8644e642103096daf7f0b0f44c9 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sat, 12 Mar 2011 11:43:20 -0500
Subject: [PATCH] STORM-1019 Fixed problem with beacon message display and
changed beacon message order to corresponed with menu order per Ardy Lay's
suggestion
---
indra/newview/llviewerwindow.cpp | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 031fc056194..37bdf4dd0b3 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -564,29 +564,33 @@ class LLDebugText
// only display these messages if we are actually rendering beacons at this moment
if (LLPipeline::getRenderBeacons(NULL) && LLFloaterReg::instanceVisible("beacons"))
{
- if (LLPipeline::getRenderParticleBeacons(NULL))
+ if (LLPipeline::getRenderMOAPBeacons(NULL))
{
- addText(xpos, ypos, "Viewing particle beacons (blue)");
+ addText(xpos, ypos, "Viewing media beacons (white)");
ypos += y_inc;
}
+
if (LLPipeline::toggleRenderTypeControlNegated((void*)LLPipeline::RENDER_TYPE_PARTICLES))
{
addText(xpos, ypos, "Hiding particles");
ypos += y_inc;
}
- if (LLPipeline::getRenderPhysicalBeacons(NULL))
+
+ if (LLPipeline::getRenderParticleBeacons(NULL))
{
- addText(xpos, ypos, "Viewing physical object beacons (green)");
+ addText(xpos, ypos, "Viewing particle beacons (blue)");
ypos += y_inc;
}
- if (LLPipeline::getRenderScriptedBeacons(NULL))
+
+ if (LLPipeline::getRenderSoundBeacons(NULL))
{
- addText(xpos, ypos, "Viewing scripted object beacons (red)");
+ addText(xpos, ypos, "Viewing sound beacons (yellow)");
ypos += y_inc;
}
- if (LLPipeline::getRenderMOAPBeacons(NULL))
+
+ if (LLPipeline::getRenderScriptedBeacons(NULL))
{
- addText(xpos, ypos, "Viewing media beacons (white)");
+ addText(xpos, ypos, "Viewing scripted object beacons (red)");
ypos += y_inc;
}
else
@@ -595,9 +599,10 @@ class LLDebugText
addText(xpos, ypos, "Viewing scripted object with touch function beacons (red)");
ypos += y_inc;
}
- if (LLPipeline::getRenderSoundBeacons(NULL))
+
+ if (LLPipeline::getRenderPhysicalBeacons(NULL))
{
- addText(xpos, ypos, "Viewing sound beacons (yellow)");
+ addText(xpos, ypos, "Viewing physical object beacons (green)");
ypos += y_inc;
}
}
--
GitLab