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

Merge remote branch 'Ascent/master'

Browse Source 
Conflicts:
	indra/llaudio/llaudioengine.cpp
	indra/llcommon/llqueuedthread.cpp
	indra/llimage/llimage.cpp
	indra/llimage/llimagepng.cpp
	indra/llimage/llimagepng.h
	indra/llimagej2coj/llimagej2coj.cpp
	indra/llrender/llimagegl.cpp
	indra/llrender/llrender.cpp
	indra/newview/ascentprefssys.cpp
	indra/newview/ascentprefsvan.cpp
	indra/newview/gpu_table.txt
	indra/newview/llfloaterauction.cpp
	indra/newview/llsavedsettingsglue.cpp
	indra/newview/llsavedsettingsglue.h
	indra/newview/llstartup.cpp
	indra/newview/llviewercontrol.cpp
	indra/newview/llviewercontrol.h
	indra/newview/llvoavatar.cpp
	indra/newview/pipeline.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
This commit is contained in:
unknown
2010-10-11 07:01:10 -05:00
parent 30aeb49013 21d092705c
commit 25190a6d8a
60 changed files with 2957 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llrender/llimagegl.cpp
View File

@@ -1564,9 +1564,10 @@ void LLImageGL::setNoDelete()
void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in)
{
delete [] mPickMask; //Always happens regardless.
mPickMask = NULL;
mPickMaskSize = 0;
if (!(mFormatType != GL_UNSIGNED_BYTE ||
mFormatPrimary != GL_RGBA)) //can only generate a pick mask for this sort of texture
{
@@ -1582,7 +1583,6 @@ void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in)
memset(mPickMask, 0, sizeof(U8) * mPickMaskSize);
U32 pick_bit = 0;
for (S32 y = 0; y < height; y += 2)
{
for (S32 x = 0; x < width; x += 2)
@@ -1600,7 +1600,7 @@ void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in)
mPickMask[pick_idx] |= 1 << pick_offset;
}
++pick_bit;
}
}