Second Life viewer sources 1.20.2

1 files changed, 11 insertions, 14 deletions

diff --git a/linden/indra/newview/llhudmanager.cpp b/linden/indra/newview/llhudmanager.cpp
index 2c38943..5217893 100644
--- a/linden/indra/newview/llhudmanager.cpp
+++ b/linden/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.
@@ -60,7 +58,6 @@ LLHUDManager::LLHUDManager()
 
 LLHUDManager::~LLHUDManager()
 {
-        mHUDEffects.reset();
 }
 
 
@@ -110,6 +107,12 @@ void LLHUDManager::sendEffects()
         }
 }
 
+//static
+void LLHUDManager::shutdownClass()
+{
+        getInstance()->mHUDEffects.reset();
+}
+
 void LLHUDManager::cleanupEffects()
 {
         S32 i = 0;
@@ -155,12 +158,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 +169,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 +201,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)