summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatercolorpicker.cpp
AgeCommit message (Collapse)Author
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2022-06-29SL-17570 Slightly better support for system's pickerAndrey Kleshchev
2022-06-29SL-17570 Color picker should properly focus it's parent when closingAndrey Kleshchev
This reverts MAINT-1401, but looks like that was fixed properly later
2019-01-25SL-1945 Day Cycle Editor Copy Trackandreykproductengine
2016-03-16merge changes for DRTVWR-417Oz Linden
2015-12-23MAINT-1401 FIXED Pressing 'Cancel' button in 'Color picker' dialog changes ↵Mnikolenko ProductEngine
color of prim to the previous
2015-11-10remove execute permission from many files that should not have itOz Linden
2014-10-10MAINT-3202 FIXED Cancel of selected colour in "Colour picker" floater does ↵andreykproductengine
not return colour icon to previous condition
2014-05-07Merge downstream version 3.7.8 codesimon
2014-03-18MAINT-3832 Make color pickers actually apply result immediately when "apply ↵Dave Parks
immediately" is checked.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
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
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup improvements to stats display of llstatbar added scene load stats floater accessed with ctrl|shift|2
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() ↵Gilbert Gonzales
instead of getChildView(). Also using settings.xml to store common custom variables.
2012-08-29CHUI-305: Problem: The 'resident picker' had multiple parents and due to the ↵Gilbert Gonzales
design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'.
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 ↵Vadim ProductEngine
a focused floater.
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
overzealous elimination of xml parsing
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
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
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 ↵Eugene Mutavchi
is Nearly Invisible) --HG-- branch : product-engine
2009-12-10EXT-2819 : Crash in appearance color pickerLoren Shih
Enforcing out-of-order destruction in llfloatercustomize to avoid this crash.
2009-12-09EXT-2819 crash in color picker in appearance editorNyx (Neal Orman)
Made progress by writing code to match the style we use for the texture picker. It now should not make a difference if you destroy the color picker floater or the color swatch control first - either direction it should do sufficient cleanup and protection. However, still getting this crash. Will investigate further later. Code reviewed by Seraph --HG-- branch : avatar-pipeline
2009-10-29Fixed some outlines being 1 pixel away from color swatches. Not reviewed.James Cook
2009-08-04svn merge -r 128442:129343 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
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 ↵James Cook
UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
merge release@93398 viewer-merge-1@94007 -> release dataserver-is-deprecated
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-04-23QAR-488 Viewer 1.20 RC 2Steven Bennetts
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵Steven Bennetts
79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 04:35:50 +0000