Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Drake Arconis
2011-11-08 05:22:47 -05:00
25 changed files with 209 additions and 96 deletions

View File

@@ -4500,7 +4500,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
gPipeline.resetDrawOrders();
}
if (high_res && (show_ui || !hide_hud))
if (high_res)
{
send_agent_resume();
}