From 6d52efe452aa8469e0343da1c7d108f3f52ab651 Mon Sep 17 00:00:00 2001 From: Brad Kittenbrink Date: Wed, 27 Feb 2008 18:58:14 +0000 Subject: Merge of windlight into release (QAR-286). This includes all changes in windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620 --- indra/newview/llhudmanager.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llhudmanager.cpp') diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp index c08e9552fc..30a09a96d3 100644 --- a/indra/newview/llhudmanager.cpp +++ b/indra/newview/llhudmanager.cpp @@ -37,7 +37,6 @@ #include "object_flags.h" #include "llagent.h" -#include "llhudconnector.h" #include "llhudeffect.h" #include "pipeline.h" #include "llviewercontrol.h" @@ -91,7 +90,7 @@ void LLHUDManager::sendEffects() llwarns << "Trying to send dead effect!" << llendl; continue; } - if (hep->mType <= LLHUDObject::LL_HUD_CONNECTOR) + if (hep->mType < LLHUDObject::LL_HUD_EFFECT_BEAM) { llwarns << "Trying to send effect of type " << hep->mType << " which isn't really an effect and shouldn't be in this list!" << llendl; continue; -- cgit v1.2.3