diff options
author | Dave Parks <davep@lindenlab.com> | 2011-02-22 18:33:33 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-02-22 18:33:33 -0600 |
commit | c690c30ec173faf8d8087ecb38cadbb9dd1adb4e (patch) | |
tree | 4ba601c39592cf2d36fc568714060280da4dcad3 /indra/newview/llmeshrepository.cpp | |
parent | add08538af7bc6c19507835688ac6f970184bb6f (diff) |
SH-438 Use node name instead of mesh name for object names when importing meshes.
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 a2b0ac09af..b6e3626cba 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2981,7 +2981,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->getName(); + object_params["name"] = instance.mLabel; // load material from dae file object_params["facelist"] = LLSD::emptyArray(); |