livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUILDFIX: attempted gcc fix

meow-7.2.2
Richard Linden 2013-04-12 15:55:34 -07:00
parent a904e7b21b
commit 39d8ea6327
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcommon/lltracerecording.h
View File

@ -362,7 +362,7 @@ namespace LLTrace
size_t total_periods = mRecordingPeriods.size();
num_periods = llmin(num_periods, total_periods);
typename T::value_t mean = typename T::value_t();
typename T::mean_t mean = typename T::mean_t();
if (num_periods <= 0) { return mean; }
for (S32 i = 1; i <= num_periods; i++)
@ -383,7 +383,7 @@ namespace LLTrace
size_t total_periods = mRecordingPeriods.size();
num_periods = llmin(num_periods, total_periods);
typename T::value_t mean = typename T::value_t();
typename T::mean_t mean = typename T::mean_t();
if (num_periods <= 0) { return mean; }
for (S32 i = 1; i <= num_periods; i++)

12
indra/newview/llviewerobjectlist.cpp
View File

@ -2066,9 +2066,7 @@ S32 LLViewerObjectList::findReferences(LLDrawable *drawablep) const
void LLViewerObjectList::orphanize(LLViewerObject *childp, U32 parent_id, U32 ip, U32 port)
{
#ifdef ORPHAN_SPAM
LL_DEBUGS("ORPHANS") << "Orphaning object " << childp->getID() << " with parent " << parent_id << llendl;
#endif
LL_DEBUGS("ORPHANS") << "Orphaning object " << childp->getID() << " with parent " << parent_id << LL_ENDL;
// We're an orphan, flag things appropriately.
childp->mOrphaned = TRUE;
@ -2156,11 +2154,11 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port)
continue;
}
LL_DEBUGS("ORPHANS") << "Reunited parent " << objectp->mID
<< " with child " << childp->mID << LL_ENDL;
LL_DEBUGS("ORPHANS") << "Glob: " << objectp->getPositionGlobal() << LL_ENDL;
LL_DEBUGS("ORPHANS") << "Agent: " << objectp->getPositionAgent() << LL_ENDL;
#ifdef ORPHAN_SPAM
llinfos << "Reunited parent " << objectp->mID
<< " with child " << childp->mID << llendl;
llinfos << "Glob: " << objectp->getPositionGlobal() << llendl;
llinfos << "Agent: " << objectp->getPositionAgent() << llendl;
addDebugBeacon(objectp->getPositionAgent(),"");
#endif
gPipeline.markMoved(objectp->mDrawable);