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

Merge.

Browse Source
This commit is contained in:
Shyotl
2017-03-14 04:02:53 -05:00
parent 4a9ff22eeb
commit f4a713a500
99 changed files with 1010 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerobject.cpp
View File

@@ -123,13 +123,13 @@ F64Seconds LLViewerObject::sMaxUpdateInterpolationTime(3.0); // For motion inte
F64Seconds LLViewerObject::sPhaseOutUpdateInterpolationTime(2.0); // For motion interpolation: after Y seconds with no updates, taper off motion prediction
static LLFastTimer::DeclareTimer FTM_CREATE_OBJECT("Create Object");
static LLTrace::BlockTimerStatHandle FTM_CREATE_OBJECT("Create Object");
// static
LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
{
LLViewerObject *res = NULL;
LLFastTimer t1(FTM_CREATE_OBJECT);
LL_RECORD_BLOCK_TIME(FTM_CREATE_OBJECT);
switch (pcode)
{