diff options
| author | Tofu Buzzard <no-email> | 2011-02-22 18:32:25 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-22 18:32:25 -0800 |
| commit | df42eceb91e796c876639aa4a711b9baaf438914 (patch) | |
| tree | 520e3291611c40bed28a0c8d73b55fa102602a64 /indra/newview/llmeshrepository.cpp | |
| parent | b660dcfce4bafd0320be97e25c38ff09ceac336d (diff) | |
| parent | 9c7e38a3d1318f05f43f404e04dbd619a17a3e31 (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(); |