summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-10-29 12:07:02 -0500
committerDave Parks <davep@lindenlab.com>2010-10-29 12:07:02 -0500
commitb32cb5b1e4cd40a9e9363803d04a940616213054 (patch)
tree313860977f481121d913508948869358162ad63a /indra
parente8a92e69101b0db9166371f800feae7b6e1a9a82 (diff)
Fix for assert in pipeline on startup.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewercontrol.cpp5
1 files changed, 4 insertions, 1 deletions
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;
}