livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for SH-4290: Running viewer with SceneLoadingMonitorEnabled causes viewer to be unresponsive on login on low end machine

meow-7.2.2
Xiaohong Bao 2013-07-31 21:21:58 -06:00
parent c5651d05fd
commit d65243063c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llscenemonitor.cpp
View File

@ -211,11 +211,19 @@ LLRenderTarget& LLSceneMonitor::getCaptureTarget()
void LLSceneMonitor::freezeAvatar(LLCharacter* avatarp)
{
mAvatarPauseHandles.push_back(avatarp->requestPause());
if(mEnabled)
{
mAvatarPauseHandles.push_back(avatarp->requestPause());
}
}
void LLSceneMonitor::freezeScene()
{
if(!mEnabled)
{
return;
}
//freeze all avatars
for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
iter != LLCharacter::sInstances.end(); ++iter)
@ -262,7 +270,7 @@ void LLSceneMonitor::capture()
static LLCachedControl<F32> scene_load_sample_time(gSavedSettings, "SceneLoadingMonitorSampleTime");
static bool force_capture = true;
bool enabled = monitor_enabled || mDebugViewerVisible;
bool enabled = LLGLSLShader::sNoFixedFunction && (monitor_enabled || mDebugViewerVisible);
if(mEnabled != enabled)
{
if(mEnabled)
@ -288,10 +296,9 @@ void LLSceneMonitor::capture()
force_capture = true;
}
if((mRecordingTimer.getElapsedTimeF32() > scene_load_sample_time()
if(mEnabled
&& (mRecordingTimer.getElapsedTimeF32() > scene_load_sample_time()
|| force_capture)
&& mEnabled
&& LLGLSLShader::sNoFixedFunction
&& last_capture_frame != gFrameCount)
{
force_capture = false;