diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-31 07:31:41 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-31 07:31:41 -0700 |
| commit | e42142005585f580d39036fba02ec060d739cc5f (patch) | |
| tree | 799f0fb80499487b8c7d4f7f1159dd1c3a72ef27 /indra | |
| parent | c7da38eb68249e8178fab645041a450c63a18b28 (diff) | |
Re-apply llmin fix for Mac
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index f5ec803f51..aa5687f338 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -454,7 +454,7 @@ S32 LLDrawPoolAvatar::getNumDeferredPasses() { if (LLPipeline::sImpostorRender) { - return 19; + return 3; } else { diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 9d5f2f9233..fd9f3dc486 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5274,7 +5274,7 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std:: llassert(mask < sizeof(pass)/sizeof(U32)); - mask = llmin(mask, sizeof(pass)/sizeof(U32)-1); + mask = llmin(mask, (U32)(sizeof(pass)/sizeof(U32)-1)); registerFace(group, facep, pass[mask]); } |