summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercolorpicker.cpp
AgeCommit message (Expand)Author
2015-12-23MAINT-1401 FIXED Pressing 'Cancel' button in 'Color picker' dialog changes co...Mnikolenko ProductEngine
2014-10-10MAINT-3202 FIXED Cancel of selected colour in "Colour picker" floater does no...andreykproductengine
2014-05-07Merge downstream version 3.7.8 codesimon
2014-03-18MAINT-3832 Make color pickers actually apply result immediately when "apply i...Dave Parks
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-22merge with viewer-releaseRichard Linden
2013-03-18SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2012-08-31MAINT-284 FIXED setVisbible(true) after openFloater to allow make_ui_soundmaxim_productengine
2012-08-30CHUI-305: Minor changes after code review. Using templated findChild() instea...Gilbert Gonzales
2012-08-29CHUI-305: Problem: The 'resident picker' had multiple parents and due to the ...Gilbert Gonzales
2012-01-03use lazy deletion of views via die() method to avoid some potential crashesRichard Linden
2010-12-01STORM-676 ADDITIONAL_FIX Force color swatch to be 100% opaque while it's in a...Vadim ProductEngine
2010-11-25STORM-676 ADDITIONAL FIX Added transparency support to the color picker floater.Vadim ProductEngine
2010-09-08DEV-53094 FIX Selecting texture picker causes viewer to crashRichard Nelson
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-02-04Fixed major bug EXT-4853 (Color Picker - Arrow Used to Select Color Density i...Eugene Mutavchi
2009-12-10EXT-2819 : Crash in appearance color pickerLoren Shih
2009-12-09EXT-2819 crash in color picker in appearance editorNyx (Neal Orman)
2009-10-29Fixed some outlines being 1 pixel away from color swatches. Not reviewed.James Cook
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-04-23QAR-488 Viewer 1.20 RC 2Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-04-05svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> ...Richard Nelson
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears