diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-14 09:05:55 -0500 |
| commit | c880c961bb2a0838bc529efc07cfeb12f5636d88 (patch) | |
| tree | beff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/newview/llfloatercolorpicker.cpp | |
| parent | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff) | |
| parent | e87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff) | |
merge changes for 3.4.5
Diffstat (limited to 'indra/newview/llfloatercolorpicker.cpp')
| -rw-r--r-- | indra/newview/llfloatercolorpicker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp index 05d73c2416..d6ebe44daa 100644 --- a/indra/newview/llfloatercolorpicker.cpp +++ b/indra/newview/llfloatercolorpicker.cpp @@ -172,9 +172,9 @@ void LLFloaterColorPicker::createUI () // void LLFloaterColorPicker::showUI () { + openFloater(getKey()); setVisible ( TRUE ); setFocus ( TRUE ); - openFloater(getKey()); // HACK: if system color picker is required - close the SL one we made and use default system dialog if ( gSavedSettings.getBOOL ( "UseDefaultColorPicker" ) ) |