From 52cb2aea8667056671b67a3c70eeefd00a061751 Mon Sep 17 00:00:00 2001 From: Kartic Krishnamurthy Date: Wed, 8 Aug 2007 00:55:57 +0000 Subject: svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1 --- indra/newview/llhudmanager.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'indra/newview/llhudmanager.cpp') 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++) { -- cgit v1.2.3