diff options
author | Roxie Linden <roxie@lindenlab.com> | 2011-06-08 16:46:29 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-08 16:46:29 -0700 |
commit | 73d807bd894e64c653efc6093c408d046e510a5b (patch) | |
tree | 8584a55e7963c77cc25a8ecf26b4548c9e18be55 /indra/newview | |
parent | fe67bd7cfa5d066a9c24898768445b24eaf28e95 (diff) |
change the color specifier to 'diffuse_color' in the
mesh upload blobs
Diffstat (limited to 'indra/newview')
-rw-r--r-- | 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 6b8b0f5a00..d4198041ec 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -1533,7 +1533,7 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, bool include_textures) face_entry["offsett"] = 0.0; face_entry["imagerot"] = 0.0; } - face_entry["colors"] = ll_sd_from_color4(material.mDiffuseColor); + face_entry["diffuse_color"] = ll_sd_from_color4(material.mDiffuseColor); face_entry["fullbright"] = material.mFullbright; instance_entry["face_list"][face_num] = face_entry; } |