diff options
| author | Richard Linden <none@none> | 2013-04-12 15:55:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-04-12 15:55:34 -0700 |
| commit | 39d8ea6327ad96b4977dfec991a20d66e2442b50 (patch) | |
| tree | c0d9481be88205eb411a0fc7dd8abdc208bb7de3 /indra | |
| parent | a904e7b21b64a87073a446445de46318832d1eb1 (diff) | |
BUILDFIX: attempted gcc fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/lltracerecording.h | 4 | ||||
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h index 765a510dbb..511db0e115 100644 --- a/indra/llcommon/lltracerecording.h +++ b/indra/llcommon/lltracerecording.h @@ -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++) diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index dde387509a..04c9fc2f94 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -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); |