diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-23 17:21:05 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-05-23 17:21:05 -0400 |
| commit | 302ec5586d1b3d589af0baeb907d5be2d12407f4 (patch) | |
| tree | 949a9df13b59221402f6df99a6be5c25ff7d5f56 | |
| parent | 7b51aa0ba2a9cffba71e87ad5c19b30bf87904a1 (diff) | |
SH-1492 WIP
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 5e006e90a1..9e0b17280e 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1518,7 +1518,6 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures) { LLImportMaterial& material = instance.mMaterial[face_num]; LLSD face_entry = LLSD::emptyMap(); - LLViewerFetchedTexture *texture = material.mDiffuseMap.get(); if (texture != NULL) @@ -1549,14 +1548,20 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures) res["texture_list"][texture_num] = LLSD::Binary(str.begin(),str.end()); texture_num++; } + } + // Subset of TextureEntry fields. + if (texture) + { face_entry["image"] = texture_index[texture]; - face_entry["scales"] = 1.0; - face_entry["scalet"] = 1.0; - face_entry["offsets"] = 0.0; - face_entry["offsett"] = 0.0; - face_entry["imagerot"] = 0.0; } + face_entry["scales"] = 1.0; + face_entry["scalet"] = 1.0; + face_entry["offsets"] = 0.0; + face_entry["offsett"] = 0.0; + face_entry["imagerot"] = 0.0; + face_entry["colors"] = ll_sd_from_color4(material.mDiffuseColor); + face_entry["fullbright"] = material.mFullbright; mesh_entry["face_list"][face_num] = face_entry; } |