diff options
| author | Tofu Buzzard <no-email> | 2011-02-22 18:31:56 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-22 18:31:56 -0800 |
| commit | 9c7e38a3d1318f05f43f404e04dbd619a17a3e31 (patch) | |
| tree | 0b48d8e70ca1ce75c71d9a0b29bcb60e015de632 /indra/newview/llmeshrepository.cpp | |
| parent | 1ff941362fa5617a94fb85839d6540e5abb1b78a (diff) | |
| parent | d46594bf714cd19ebcbf693463c4d39e4c771bb8 (diff) | |
merge
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 4d6bd46840..6c647eb9da 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(); |