diff options
| author | Richard Nelson <none@none> | 2010-09-09 11:38:34 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-09-09 11:38:34 -0700 |
| commit | 4f442653dcf302b30d049482900c56b7456f94e8 (patch) | |
| tree | bdf3218f3fcb420bde0ea298a3f465e02710f616 /indra/newview/llfloatercolorpicker.cpp | |
| parent | 9dc0cbf6dabf729d8759f4abcf226ed05bb64055 (diff) | |
| parent | e7884bbab54d172957f5ee05df8dad3a4f8931bd (diff) | |
Automated merge with ssh://hg.lindenlab.com/monroe/viewer-experience-3
Diffstat (limited to 'indra/newview/llfloatercolorpicker.cpp')
| -rw-r--r-- | indra/newview/llfloatercolorpicker.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp index 4201ae1da1..69f1774ff8 100644 --- a/indra/newview/llfloatercolorpicker.cpp +++ b/indra/newview/llfloatercolorpicker.cpp @@ -107,6 +107,8 @@ LLFloaterColorPicker::LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show mCanApplyImmediately ( show_apply_immediate ), mContextConeOpacity ( 0.f ) { + buildFromFile ( "floater_color_picker.xml"); + // create user interface for this picker createUI (); |