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

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

Browse Source 
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
This commit is contained in:
Shyotl
2012-11-29 11:54:41 -06:00
parent 3a4b6cf6b6 e17405d80a
commit 794dbacea3
358 changed files with 27109 additions and 8865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llimage/llimage.cpp
View File

@@ -1239,6 +1239,7 @@ file_extensions[] =
{
{ "bmp", IMG_CODEC_BMP },
{ "tga", IMG_CODEC_TGA },
{ "j2k", IMG_CODEC_J2C },
{ "j2c", IMG_CODEC_J2C },
{ "jp2", IMG_CODEC_J2C },
{ "texture", IMG_CODEC_J2C },