Merge.
This commit is contained in:
@@ -405,11 +405,11 @@ void LLWLParamManager::updateShaderLinks()
|
||||
}
|
||||
}
|
||||
|
||||
static LLFastTimer::DeclareTimer FTM_UPDATE_WLPARAM("Update Windlight Params");
|
||||
static LLTrace::BlockTimerStatHandle FTM_UPDATE_WLPARAM("Update Windlight Params");
|
||||
|
||||
void LLWLParamManager::propagateParameters(void)
|
||||
{
|
||||
LLFastTimer ftm(FTM_UPDATE_WLPARAM);
|
||||
LL_RECORD_BLOCK_TIME(FTM_UPDATE_WLPARAM);
|
||||
|
||||
LLVector4 sunDir;
|
||||
LLVector4 moonDir;
|
||||
@@ -474,7 +474,7 @@ void LLWLParamManager::propagateParameters(void)
|
||||
|
||||
void LLWLParamManager::update(LLViewerCamera * cam)
|
||||
{
|
||||
LLFastTimer ftm(FTM_UPDATE_WLPARAM);
|
||||
LL_RECORD_BLOCK_TIME(FTM_UPDATE_WLPARAM);
|
||||
|
||||
// update clouds, sun, and general
|
||||
mCurParams.updateCloudScrolling();
|
||||
|
||||
Reference in New Issue
Block a user