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

[OpenSim] Feature Request: Don't clamp max_import_scale to 240 on NonSL grids, and make max_import_scale start off based on the hippolimits' MaxPrimScale, not the SL-constant

Browse Source
This commit is contained in:
Inusaito Sayori
2013-10-10 04:36:47 -04:00
parent 13e25cfe6a
commit 91f6a4efa3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloatermodelpreview.cpp
View File

@@ -80,6 +80,7 @@
#include <boost/algorithm/string.hpp>
#include "hippogridmanager.h"
#include "hippolimits.h"
const S32 SLM_SUPPORTED_VERSION = 3;
@@ -3331,6 +3332,8 @@ void LLModelPreview::rebuildUploadData()
}
}
const F32 DEFAULT_MAX_PRIM_SCALE(gHippoLimits->getMaxPrimScale());
F32 max_import_scale = (DEFAULT_MAX_PRIM_SCALE-0.1f)/max_scale;
F32 max_axis = llmax(mPreviewScale.mV[0], mPreviewScale.mV[1]);
@@ -3338,7 +3341,8 @@ void LLModelPreview::rebuildUploadData()
max_axis *= 2.f;
//clamp scale so that total imported model bounding box is smaller than 240m on a side
max_import_scale = llmin(max_import_scale, 240.f/max_axis);
if (gHippoGridManager->getConnectedGrid()->isSecondLife()) // on SecondLife only
max_import_scale = llmin(max_import_scale, 240.f/max_axis);
scale_spinner->setMaxValue(max_import_scale);