summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Lihatskiy <andreylproductengine@lindenlab.com>2015-09-08 20:24:49 +0300
committerAndrey Lihatskiy <andreylproductengine@lindenlab.com>2015-09-08 20:24:49 +0300
commit0c3bc2e4b97f506dbdc18b7021bd66f212134819 (patch)
treed56ec69066cc23402c99a5ef5833a89ee8e4e53c /indra/newview
parent1d22db9ed806e534ce025ca7d9cd07ee16b88e08 (diff)
parentc1e3f778cb377999edf49764088f3f23a2302afc (diff)
Merged in develop (pull request #1)
MAINT-5602 FIXED Viewer crashes when loading physics from file
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 20ba7548e5..a2a1dfbdb8 100755
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -3768,7 +3768,7 @@ BOOL LLModelPreview::render()
genBuffers(LLModel::LOD_PHYSICS, false);
}
- U32 num_models = mVertexBuffer[mPreviewLOD][model].size();
+ U32 num_models = mVertexBuffer[LLModel::LOD_PHYSICS][model].size();
for (U32 i = 0; i < num_models; ++i)
{
LLVertexBuffer* buffer = mVertexBuffer[LLModel::LOD_PHYSICS][model][i];