diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-30 17:37:19 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-30 17:37:19 -0400 |
| commit | a71e0b1862cc184f40d0f893cc62b1e636d3b0a5 (patch) | |
| tree | 5841eb481a1e791bd0cd11158660c91f3f9968c0 /indra/newview/llfloaterbeacons.cpp | |
| parent | 45433246d4daebd8a849be9de947881026c5d095 (diff) | |
| parent | f633aef1af5a1a695df655080d3a20c033a31e18 (diff) | |
pull latest changes from viewer-development
Diffstat (limited to 'indra/newview/llfloaterbeacons.cpp')
| -rw-r--r-- | indra/newview/llfloaterbeacons.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp index e24df948c4..316294a477 100644 --- a/indra/newview/llfloaterbeacons.cpp +++ b/indra/newview/llfloaterbeacons.cpp @@ -48,6 +48,7 @@ LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed) LLPipeline::setRenderParticleBeacons( gSavedSettings.getBOOL("particlesbeacon")); LLPipeline::setRenderHighlights( gSavedSettings.getBOOL("renderhighlights")); LLPipeline::setRenderBeacons( gSavedSettings.getBOOL("renderbeacons")); + LLPipeline::setRenderMOAPBeacons( gSavedSettings.getBOOL("moapbeacon")); mCommitCallbackRegistrar.add("Beacons.UICheck", boost::bind(&LLFloaterBeacons::onClickUICheck, this,_1)); } @@ -96,6 +97,7 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) else if(name == "physical") LLPipeline::setRenderPhysicalBeacons(check->get()); else if(name == "sounds") LLPipeline::setRenderSoundBeacons(check->get()); else if(name == "particles") LLPipeline::setRenderParticleBeacons(check->get()); + else if(name == "moapbeacon") LLPipeline::setRenderMOAPBeacons(check->get()); else if(name == "highlights") { LLPipeline::toggleRenderHighlights(NULL); |