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

Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future

Browse Source 
Conflicts:
	indra/llvfs/lldiriterator.cpp
	indra/newview/app_settings/settings.xml
	indra/newview/llviewerregion.cpp
This commit is contained in:
Siana Gearz
2011-07-21 00:20:06 +02:00
parent 2dd733cbaa fe0cd9f702
commit f30c284063
339 changed files with 8700 additions and 4498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewertexturelist.cpp
View File

@@ -1087,9 +1087,6 @@ LLPointer<LLImageJ2C> LLViewerTextureList::convertToUploadFile(LLPointer<LLImage
return compressedImage;
}
const S32 MIN_VIDEO_RAM = 32;
const S32 MAX_VIDEO_RAM = 512; // 512MB max for performance reasons.
// Returns min setting for TextureMemory (in MB)
S32 LLViewerTextureList::getMinVideoRamSetting()
{