diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-13 18:34:54 -0400 |
commit | 73f474d886d2430db3d5c8f7729f769b389730a4 (patch) | |
tree | 5b1f481284a030c72ac08d8b3027ed608bc3ceb6 /indra/newview/llviewerpartsource.cpp | |
parent | 81ffd3fccac709a5903dd0d7572db50c50850347 (diff) | |
parent | 180dd12ed637c1f63a5013d25fbac002e1d94c93 (diff) |
Merge. Refresh from /lindenlab/viewer-cat prior to pushing.
Diffstat (limited to 'indra/newview/llviewerpartsource.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerpartsource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp index 8c49ce646d..b6bbd6140d 100644..100755 --- a/indra/newview/llviewerpartsource.cpp +++ b/indra/newview/llviewerpartsource.cpp @@ -313,7 +313,7 @@ void LLViewerPartSourceScript::update(const F32 dt) part->mStartGlow = mPartSysData.mPartData.mStartGlow; part->mEndGlow = mPartSysData.mPartData.mEndGlow; - part->mGlow = LLColor4U(0, 0, 0, (U8) (part->mStartGlow*255.f)); + part->mGlow = LLColor4U(0, 0, 0, (U8) llround(part->mStartGlow*255.f)); if (mPartSysData.mPattern & LLPartSysData::LL_PART_SRC_PATTERN_DROP) { |