diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-15 18:54:35 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-15 18:54:35 -0400 |
| commit | 0301feb80bbf23d65cfd1ddbe22f297c3ff61a48 (patch) | |
| tree | a6b1db787564edae2c7c52c66ed01d35b5cd7a23 /indra | |
| parent | 2d24203e5912bc6a9c8fa0e5c44cfe0711cb121a (diff) | |
SH-2029 FIX - fix for mac build error, hopefully
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 6783d3d1dc..0ce8dcd46b 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -2080,7 +2080,7 @@ bool LLModelLoader::loadFromSLM(const std::string& filename) std::string name = data["name"]; if (!name.empty()) { - model[LLModel::LOD_HIGH][0]->mLabel = data["name"]; + model[LLModel::LOD_HIGH][0]->mLabel = name; } |