From 9063e60aefe54f7c45aaa8cb24e8998b2c7343ab Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:55 -0500
Subject: Second Life viewer sources 1.20.10

---
 linden/indra/newview/llviewerdisplay.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/llviewerdisplay.cpp')

diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index b9a5986..e02ff6f 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -613,7 +613,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 		if (!for_snapshot)
 		{
 			LLAppViewer::instance()->pingMainloopTimeout("Display:Imagery");
-			gPipeline.processImagery(*LLViewerCamera::getInstance());
 			gPipeline.generateWaterReflection(*LLViewerCamera::getInstance());
 		}
 
@@ -823,6 +822,7 @@ void render_hud_attachments()
 
 		//cull, sort, and render hud objects
 		static LLCullResult result;
+		LLSpatialGroup::sNoDelete = TRUE;
 		gPipeline.updateCull(hud_cam, result);
 
 		gPipeline.toggleRenderType(LLPipeline::RENDER_TYPE_BUMP);
@@ -834,6 +834,8 @@ void render_hud_attachments()
 
 		gPipeline.renderGeom(hud_cam);
 
+		LLSpatialGroup::sNoDelete = FALSE;
+
 		render_hud_elements();
 		//restore type mask
 		gPipeline.setRenderTypeMask(mask);
-- 
cgit v1.1