Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into V2TextureSystem

Browse Source 
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
This commit is contained in:
Shyotl
2011-04-12 22:29:49 -05:00
parent 3a3805fd18 aa1167e4d5
commit 4d4c49cd24
95 changed files with 3056 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llrender/llfontgl.cpp
View File

@@ -788,9 +788,12 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
{
return 0;
}
llassert(max_pixels >= 0.f);
llassert(max_chars >= 0);
//llassert(max_pixels >= 0.f);
//llassert(max_chars >= 0);
if(max_pixels < 0.f || max_chars < 0) {
return 0;
}
BOOL clip = FALSE;
F32 cur_x = 0;