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

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Browse Source 
# Conflicts:
#	indra/llmath/lloctree.h
#	indra/newview/llsurface.cpp
This commit is contained in:
Shyotl
2020-03-15 00:53:20 -05:00
parent 26976b715d e502b87b63
commit a29491658b
353 changed files with 22075 additions and 10251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llmeshrepository.cpp
View File

@@ -1916,7 +1916,7 @@ S32 LLMeshRepository::getActualMeshLOD(LLSD& header, S32 lod)
{
lod = llclamp(lod, 0, 3);
S32 version = header["version"];
S32 version = header["version"].asInteger();
if (header.has("404") || version > MAX_MESH_VERSION)
{