diff options
| author | leyla_linden <none@none> | 2011-02-23 16:38:45 -0800 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-02-23 16:38:45 -0800 |
| commit | b0e64098ba7dabec0b14d0129efa87b5e5a29df2 (patch) | |
| tree | 1efebf171b17a4eb5a47cfba224a268dfe54e337 /indra/newview/llmeshrepository.cpp | |
| parent | 9f537ad93fe7992bb6d652473a4ac3680320cab5 (diff) | |
| parent | 34428b305a437256f5db170db91506e2d94440e9 (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 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(); |