diff options
| author | Richard Nelson <none@none> | 2010-08-16 17:57:03 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-16 17:57:03 -0700 |
| commit | 0399d49e52d16c4335a933ac8d8f2ae251aeec6d (patch) | |
| tree | f7d80e317e3f2c0bcab7efc1117df403cb1f2af0 /indra/newview/llfloatercolorpicker.cpp | |
| parent | 7dce65a5db84988b2cab3d9c977a86c08124701c (diff) | |
| parent | 98bcaa1071ac4fb0b98a719c7fc7bdb3682dae4c (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatercolorpicker.cpp')
| -rw-r--r-- | indra/newview/llfloatercolorpicker.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp index 6922c515cd..0887c0353d 100644 --- a/indra/newview/llfloatercolorpicker.cpp +++ b/indra/newview/llfloatercolorpicker.cpp @@ -113,9 +113,6 @@ LLFloaterColorPicker::LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show mCanApplyImmediately ( show_apply_immediate ), mContextConeOpacity ( 0.f ) { - // build the majority of the gui using the factory builder - LLUICtrlFactory::getInstance()->buildFloater ( this, "floater_color_picker.xml", NULL ); - // create user interface for this picker createUI (); |