diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-02-13 16:07:59 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-02-13 16:07:59 +0200 |
| commit | 401eed50dea80a499df1f7080f1059b2f0b1e2d8 (patch) | |
| tree | 1bfb1c70c621012bf8ade89e961d3c2732d7f569 /indra/llprimitive | |
| parent | 9d0d5d7e6f479ee4c6b507e86d17679a1ae1251b (diff) | |
MAINT-4882 FIXED Mesh complex model upload with .slm uses different default model name
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llmodelloader.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp index c99c24585a..91198507c6 100644 --- a/indra/llprimitive/llmodelloader.cpp +++ b/indra/llprimitive/llmodelloader.cpp @@ -413,12 +413,11 @@ bool LLModelLoader::loadFromSLM(const std::string& filename) instance_list[i].mModel = model[LLModel::LOD_HIGH][idx]; } - // Set name. + // Set name for UI to use std::string name = data["name"]; - if (!name.empty() && model[LLModel::LOD_HIGH][0]->mLabel.empty()) + if (!name.empty()) { - // fall back value, should be reset later by names from instances - model[LLModel::LOD_HIGH][0]->mLabel = name; + model[LLModel::LOD_HIGH][0]->mRequestedLabel = name; } |