diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2008-02-27 18:58:14 +0000 |
| commit | 6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch) | |
| tree | a87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /indra/newview/llhudmanager.cpp | |
| parent | 6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff) | |
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
Diffstat (limited to 'indra/newview/llhudmanager.cpp')
| -rw-r--r-- | indra/newview/llhudmanager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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; |