summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2015-03-25 20:07:21 +0200
committerandreykproductengine <akleshchev@productengine.com>2015-03-25 20:07:21 +0200
commit051052b141ef5c2c3a2f08a9d69b7b982386c8c4 (patch)
treefd63b1bb841ae221fc32ad5ae2e25057c0e75903 /indra/newview/llfloatermodelpreview.cpp
parentf930cd149299c520b5147ddf72d50c57985b6d66 (diff)
MAINT-4983 Mesh upload of large model ryoma 3d loads indefinitely
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index e9f98a5c5f..9e2e8f4bc0 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1754,7 +1754,8 @@ void LLModelPreview::loadModel(std::string filename, S32 lod, bool force_disable
&LLModelPreview::stateChangedCallback,
this,
mJointTransformMap,
- mJointsFromNode );
+ mJointsFromNode,
+ gSavedSettings.getU32("ImporterModelLimit"));
if (force_disable_slm)
{