diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-10-29 12:07:21 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-10-29 12:07:21 -0500 |
| commit | b6140462bffe7482c94c417fb2b3f1eda07166c9 (patch) | |
| tree | bc1d33f906942a280955da8a42b9449110f18658 /indra/newview | |
| parent | 2ee9d84f6d311537412098a2fd0d09bbecc5e7ce (diff) | |
| parent | b32cb5b1e4cd40a9e9363803d04a940616213054 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llface.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llviewercontrol.cpp | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 4de61964c7..f5a04c8c81 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1665,6 +1665,11 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLVector4a* dst = (LLVector4a*) colors.get(); S32 num_vecs = num_vertices/4; + if (num_vertices%4 > 0) + { + ++num_vecs; + } + for (S32 i = 0; i < num_vecs; i++) { dst[i] = src; 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; } |