diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-12 14:52:18 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-12 14:52:18 -0400 |
| commit | e26bd6c140c24d72b44966127825fef5bbe47c1d (patch) | |
| tree | c70214a7a7e898b528f6b0f3ec6d47992969fe97 /indra/newview/llcolorswatch.cpp | |
| parent | 08b75949998adbe3bbb4ef1d1d7e49405e468c94 (diff) | |
| parent | 1c57963673193d5a3da638848c0540a5fbc91603 (diff) | |
merge changes for storm-1593 (marketplace inbox)
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
| -rw-r--r-- | indra/newview/llcolorswatch.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index d77ebc5367..5b942f283a 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -57,7 +57,6 @@ LLColorSwatchCtrl::Params::Params() caption_text("caption_text"), border("border") { - name = "colorswatch"; } LLColorSwatchCtrl::LLColorSwatchCtrl(const Params& p) |