From b32cb5b1e4cd40a9e9363803d04a940616213054 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Fri, 29 Oct 2010 12:07:02 -0500
Subject: Fix for assert in pipeline on startup.

---
 indra/newview/llviewercontrol.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 131c712241..13dee0c7b7 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -123,7 +123,10 @@ static bool handleSetShaderChanged(const LLSD& newvalue)
 
 static bool handleLightingDetailChanged(const LLSD& newvalue)
 {
-	gPipeline.setLightingDetail(-1);
+	if (gPipeline.isInit())
+	{
+		gPipeline.setLightingDetail(-1);
+	}
 	return true;
 }
 
-- 
cgit v1.3