summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-01-16 22:04:26 -0700
committerXiaohong Bao <bao@lindenlab.com>2013-01-16 22:04:26 -0700
commit1e95127e359124d8bcad93d263d6e3c9ae13263b (patch)
tree197709d40248710a031abf99c8348876173eb35f /indra/newview
parent3ed1bee350ed93f81a484a7c073c12708e73e946 (diff)
for SH-3663: Get windlight cloud animation and water animation to stop when pausing world updates
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llscenemonitor.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp
index bafd245aa0..2f1c4e065a 100644
--- a/indra/newview/llscenemonitor.cpp
+++ b/indra/newview/llscenemonitor.cpp
@@ -38,6 +38,7 @@
#include "llpointer.h"
#include "llspatialpartition.h"
#include "llagent.h"
+#include "pipeline.h"
LLSceneMonitorView* gSceneMonitorView = NULL;
@@ -209,6 +210,9 @@ void LLSceneMonitor::freezeScene()
// freeze everything else
gSavedSettings.setBOOL("FreezeTime", TRUE);
+
+ gPipeline.clearRenderTypeMask(LLPipeline::RENDER_TYPE_SKY, LLPipeline::RENDER_TYPE_WL_SKY,
+ LLPipeline::RENDER_TYPE_WATER, LLPipeline::RENDER_TYPE_CLOUDS, LLPipeline::END_RENDER_TYPES);
}
void LLSceneMonitor::unfreezeScene()
@@ -218,6 +222,9 @@ void LLSceneMonitor::unfreezeScene()
// thaw everything else
gSavedSettings.setBOOL("FreezeTime", FALSE);
+
+ gPipeline.setRenderTypeMask(LLPipeline::RENDER_TYPE_SKY, LLPipeline::RENDER_TYPE_WL_SKY,
+ LLPipeline::RENDER_TYPE_WATER, LLPipeline::RENDER_TYPE_CLOUDS, LLPipeline::END_RENDER_TYPES);
}
void LLSceneMonitor::capture()