diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
| commit | 8f7ec64899c54dcee6caa0307510cc4003ba7bdd (patch) | |
| tree | 513093c8550e0baf567d10168b9f750ba869fc21 /indra/newview/lloutputmonitorctrl.cpp | |
| parent | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (diff) | |
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index 340cb8187d..955f50caf5 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -52,7 +52,8 @@ LLColor4 LLOutputMonitorCtrl::sColorBound; //F32 LLOutputMonitorCtrl::sRectHeightRatio = 0.f; LLOutputMonitorCtrl::Params::Params() -: image_mute("image_mute"), +: draw_border("draw_border"), + image_mute("image_mute"), image_off("image_off"), image_on("image_on"), image_level_1("image_level_1"), |