Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llhudmanager.cpp
View File

@@ -109,12 +109,12 @@ void LLHUDManager::sendEffects()
}
if (hep->isDead())
{
llwarns << "Trying to send dead effect!" << llendl;
LL_WARNS() << "Trying to send dead effect!" << LL_ENDL;
continue;
}
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;
LL_WARNS() << "Trying to send effect of type " << hep->mType << " which isn't really an effect and shouldn't be in this list!" << LL_ENDL;
continue;
}
if (hep->getNeedsSendToSim() && hep->getOriginatedHere())
@@ -200,14 +200,14 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat
LLHUDEffect *cur_effectp = LLHUDManager::getInstance()->mHUDEffects[i];
if (!cur_effectp)
{
llwarns << "Null effect in effect manager, skipping" << llendl;
LL_WARNS() << "Null effect in effect manager, skipping" << LL_ENDL;
LLHUDManager::getInstance()->mHUDEffects.remove(i);
i--;
continue;
}
if (cur_effectp->isDead())
{
// llwarns << "Dead effect in effect manager, removing" << llendl;
// LL_WARNS() << "Dead effect in effect manager, removing" << LL_ENDL;
LLHUDManager::getInstance()->mHUDEffects.remove(i);
i--;
continue;
@@ -216,7 +216,7 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat
{
if (cur_effectp->getType() != effect_type)
{
llwarns << "Viewer effect update doesn't match old type!" << llendl;
LL_WARNS() << "Viewer effect update doesn't match old type!" << LL_ENDL;
}
effectp = cur_effectp;
break;
@@ -237,10 +237,10 @@ void LLHUDManager::processViewerEffect(LLMessageSystem *mesgsys, void **user_dat
}
else
{
llwarns << "Received viewer effect of type " << effect_type << " which isn't really an effect!" << llendl;
LL_WARNS() << "Received viewer effect of type " << effect_type << " which isn't really an effect!" << LL_ENDL;
}
}
//llinfos << "Got viewer effect: " << effect_id << llendl;
//LL_INFOS() << "Got viewer effect: " << effect_id << LL_ENDL;
}