summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolpie.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-19 09:29:08 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-19 09:29:08 -0800
commit0627d550f371c26b00e802bae288a5e6def53345 (patch)
tree8f4e740736d4fbca2eb543bb0148232e968286ef /indra/newview/lltoolpie.cpp
parent9e53ad6111ce0e15cb10f2ffb47fee8b48d1c3db (diff)
parent51e640e5d753ac9dc005cd6827db77988a04b8fa (diff)
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum/
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
-rw-r--r--indra/newview/lltoolpie.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index d49ea5109d..9c8fca3552 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -526,7 +526,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
}
static LLCachedControl<bool> enable_highlight(
- gSavedSettings, "RenderHighlightEnable", false);
+ gSavedSettings, "RenderHoverGlowEnable", false);
LLDrawable* drawable = NULL;
if (enable_highlight && show_highlight && object)
{