Merge.
This commit is contained in:
@@ -133,11 +133,11 @@ LLDrawable *LLVOWater::createDrawable(LLPipeline *pipeline)
|
||||
return mDrawable;
|
||||
}
|
||||
|
||||
static LLFastTimer::DeclareTimer FTM_UPDATE_WATER("Update Water");
|
||||
static LLTrace::BlockTimerStatHandle FTM_UPDATE_WATER("Update Water");
|
||||
|
||||
BOOL LLVOWater::updateGeometry(LLDrawable *drawable)
|
||||
{
|
||||
LLFastTimer ftm(FTM_UPDATE_WATER);
|
||||
LL_RECORD_BLOCK_TIME(FTM_UPDATE_WATER);
|
||||
LLFace *face;
|
||||
|
||||
if (drawable->getNumFaces() < 1)
|
||||
|
||||
Reference in New Issue
Block a user