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

Merge remote-tracking branch 'shyotl/future' into AltCompilers

Browse Source 
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/llvovolume.cpp
This commit is contained in:
Drake Arconis
2012-08-08 18:54:04 -04:00
parent 457177905d d2b13f515d
commit e767392b44
82 changed files with 2312 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerobject.cpp
View File

@@ -205,6 +205,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
mID(id),
mLocalID(0),
mTotalCRC(0),
mListIndex(-1),
mTEImages(NULL),
mGLName(0),
mbCanSelect(TRUE),
@@ -2232,8 +2233,9 @@ BOOL LLViewerObject::isActive() const
BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
{
static LLFastTimer::DeclareTimer ftm("Viewer Object");
LLFastTimer t(ftm);
//static LLFastTimer::DeclareTimer ftm("Viewer Object");
//LLFastTimer t(ftm);
if (mDead)
{
// It's dead. Don't update it.