diff options
| author | Kartic Krishnamurthy <drunkensufi@lindenlab.com> | 2007-08-08 00:55:57 +0000 |
|---|---|---|
| committer | Kartic Krishnamurthy <drunkensufi@lindenlab.com> | 2007-08-08 00:55:57 +0000 |
| commit | 52cb2aea8667056671b67a3c70eeefd00a061751 (patch) | |
| tree | f68af9fa643127dd4c026ec5c95b41241dd279f3 /indra/newview/llhudmanager.cpp | |
| parent | 057a5646c14d3a61a5743e7a0cb3d6276634619e (diff) | |
svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1
Diffstat (limited to 'indra/newview/llhudmanager.cpp')
| -rw-r--r-- | indra/newview/llhudmanager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp index b3e51de317..a3c6523b86 100644 --- a/indra/newview/llhudmanager.cpp +++ b/indra/newview/llhudmanager.cpp @@ -107,8 +107,8 @@ void LLHUDManager::cleanupEffects() LLHUDEffect *LLHUDManager::createViewerEffect(const U8 type, BOOL send_to_sim, BOOL originated_here) { - // Should assert that this is actually an LLHUDEffect - LLHUDEffect *hep = (LLHUDEffect *)LLHUDObject::addHUDObject(type); + // SJB: DO NOT USE addHUDObject!!! Not all LLHUDObjects are LLHUDEffects! + LLHUDEffect *hep = LLHUDObject::addHUDEffect(type); if (!hep) { return NULL; @@ -149,7 +149,6 @@ 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++) { |