diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llhudmanager.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llhudmanager.cpp')
| -rw-r--r-- | indra/newview/llhudmanager.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp index 30a09a96d3..a936118ccf 100644 --- a/indra/newview/llhudmanager.cpp +++ b/indra/newview/llhudmanager.cpp @@ -42,8 +42,6 @@ #include "llviewercontrol.h" #include "llviewerobjectlist.h" -LLHUDManager *gHUDManager = NULL; - extern BOOL gNoRender; // These are loaded from saved settings. @@ -155,12 +153,6 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat return; } - if (!gHUDManager) - { - llwarns << "No gHUDManager!" << llendl; - return; - } - LLHUDEffect *effectp = NULL; LLUUID effect_id; U8 effect_type = 0; @@ -172,20 +164,20 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat effectp = NULL; LLHUDEffect::getIDType(mesgsys, k, effect_id, effect_type); S32 i; - for (i = 0; i < gHUDManager->mHUDEffects.count(); i++) + for (i = 0; i < LLHUDManager::getInstance()->mHUDEffects.count(); i++) { - LLHUDEffect *cur_effectp = gHUDManager->mHUDEffects[i]; + LLHUDEffect *cur_effectp = LLHUDManager::getInstance()->mHUDEffects[i]; if (!cur_effectp) { llwarns << "Null effect in effect manager, skipping" << llendl; - gHUDManager->mHUDEffects.remove(i); + LLHUDManager::getInstance()->mHUDEffects.remove(i); i--; continue; } if (cur_effectp->isDead()) { // llwarns << "Dead effect in effect manager, removing" << llendl; - gHUDManager->mHUDEffects.remove(i); + LLHUDManager::getInstance()->mHUDEffects.remove(i); i--; continue; } @@ -204,7 +196,7 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat { if (!effectp) { - effectp = gHUDManager->createViewerEffect(effect_type, FALSE, FALSE); + effectp = LLHUDManager::getInstance()->createViewerEffect(effect_type, FALSE, FALSE); } if (effectp) |