diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
| commit | ade6bbb06c6a842f39a3fe32decf7c66682df092 (patch) | |
| tree | 8fa1e4ba680f916bb4c77c70f2464f295a3bd3f3 /indra/newview/llappviewer.cpp | |
| parent | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (diff) | |
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ce66bb6180..d0d6a118b3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1715,7 +1715,7 @@ void LLAppViewer::loadColorSettings() if(control->isType(TYPE_COL4)) { LLUIColorTable::ColorParams color; - color.value = control->getValue(); + color.value = (LLColor4)control->getValue(); LLUIColorTable::ColorEntryParams color_entry; color_entry.name = name; |