summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-10-29 12:07:21 -0500
committerDave Parks <davep@lindenlab.com>2010-10-29 12:07:21 -0500
commitb6140462bffe7482c94c417fb2b3f1eda07166c9 (patch)
treebc1d33f906942a280955da8a42b9449110f18658 /indra/newview/llviewercontrol.cpp
parent2ee9d84f6d311537412098a2fd0d09bbecc5e7ce (diff)
parentb32cb5b1e4cd40a9e9363803d04a940616213054 (diff)
merge
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-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;
}