QAR-849 merge maint-viewer-10-merge 96838-97237 -> release

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 7dd9ab5e1e..2bd1831946 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2665,6 +2665,18 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render
 	LLGLState::checkClientArrays();
 	U32 last_type = 0;
 	
+	// If we don't do this, we crash something on changing graphics settings
+	// from Medium -> Low, because we unload all the shaders and the 
+	// draw pools aren't aware.  I don't know if this has to be a separate
+	// loop before actual rendering. JC
+	for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
+	{
+		LLDrawPool *poolp = *iter;
+		if (poolp->isFacePool() && hasRenderType(poolp->getType()))
+		{
+			poolp->prerender();
+		}
+	}
 	for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
 	{
 		LLDrawPool *poolp = *iter;