diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-14 15:52:26 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-14 15:52:26 -0500 |
| commit | 5f8110a68ed2fdfe70e2dbd7363f1194b0f3e67d (patch) | |
| tree | a671f7f7a5e93a7fe63e200ede5467ecd26d8210 /indra/newview/llmeshrepository.cpp | |
| parent | 4351160958efa1c352e8af1ab3f48c1486ba9c5c (diff) | |
SH-439 FIX: track name requested in UI separately, so we can fall back to name from dae if needed
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 0ee0d8393e..4873eaeabd 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2920,7 +2920,7 @@ LLSD LLMeshUploadThread::createObject(LLModelInstance& instance) object_params["pos"] = ll_sd_from_vector3(position + mOrigin); object_params["rotation"] = ll_sd_from_quaternion(quat_rotation); object_params["scale"] = ll_sd_from_vector3(scale); - object_params["name"] = instance.mModel->mLabel; + object_params["name"] = instance.mModel->getName(); // load material from dae file object_params["facelist"] = LLSD::emptyArray(); |