diff options
-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]); } |