From d7b1d22063cfec84321f8a672f8ece6d8e44301a Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 24 Feb 2011 17:44:09 -0600 Subject: [PATCH] And a couple more... --- indra/newview/lldrawpooltree.cpp | 4 ++-- indra/newview/llfloateravatarlist.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp index 69fbbd983..11b3f918d 100644 --- a/indra/newview/lldrawpooltree.cpp +++ b/indra/newview/lldrawpooltree.cpp @@ -102,7 +102,7 @@ void LLDrawPoolTree::render(S32 pass) LLGLEnable test(GL_ALPHA_TEST); LLOverrideFaceColor color(this, 1.f, 1.f, 1.f, 1.f); - LLCachedControl render_animate_trees("RenderAnimateTrees",false); + static const LLCachedControl render_animate_trees("RenderAnimateTrees",false); if (render_animate_trees) { renderTree(); @@ -199,7 +199,7 @@ void LLDrawPoolTree::renderForSelect() gGL.getTexUnit(0)->setTextureColorBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_PREV_COLOR); gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_ALPHA, LLTexUnit::TBS_VERT_ALPHA); - LLCachedControl render_animate_trees("RenderAnimateTrees",false); + static const LLCachedControl render_animate_trees("RenderAnimateTrees",false); if (render_animate_trees) { renderTree(TRUE); diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 16a40f188..0eb91f7f8 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -428,7 +428,7 @@ void LLFloaterAvatarList::updateAvatarList() LLAvatarName avatar_name; if (LLAvatarNameCache::get(avatarp->getID(), &avatar_name)) { - static LLCachedControl phoenix_name_system("PhoenixNameSystem", 0); + static const LLCachedControl phoenix_name_system("PhoenixNameSystem", 0); switch (phoenix_name_system) { case 0 : name = avatar_name.getLegacyName(); break;