summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.h
AgeCommit message (Expand)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-06-22EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startupRichard Linden
2010-06-08EXT-6655 Fixed Made the default busy message repsonse localizable with alread...Andrew Dyukov
2010-02-24Implemented (EXT-4704) Add maturity icons to Prefs -> General.Sergei Litovchuk
2010-02-10Finish up EXT-3908Monroe Linden
2010-02-04fix for normal EXT-1888 Apply button remains active after Applying changesYchebotarev ProductEngine
2010-01-25Merge conflict resolution.Tofu Linden
2010-01-25"Fix" confusion over media settingsRick Pasetto
2010-01-25implemented EXT-4131 [BSI] "Only friends and groups can call or IM me" NEEDS ...Igor Borovkov
2010-01-15Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-15FIX EXT-3957: add "Media Enabled" checkbox to Privacy PrefsRick Pasetto
2010-01-14clean up LLFrstUse and it's notification but leave OverideKeys and Sandbox in...angela
2010-01-06DEV-44804 autoplay preference for media should enable the media subsystem whe...Tofu Linden
2009-12-29EXT-3720 Added Advanced > Set Window Size... for video makingJames Cook
2009-12-17removing mCancelOnCloseLeyla Farazha
2009-12-08EXT-3118 disabled Alerts appear to be enabled in PreferencesJames Cook
2009-11-23DEV-42967: Fix prefs panel to not clobber changes to prefs made by other UIRick Pasetto
2009-11-18Changes to IM Logging, includes preference changesSteve Bennetts
2009-11-10(EXT-2343) Preference > Chat > ColorSwatch 's LLUIColorTable is not workingangela
2009-11-03DEV-39999: Removed all legacy help buttons and notifications from theLynx Linden
2009-10-07EXT-1339 Create onClose method in LLFloater, and remove most bindings to mClo...James Cook
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven 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-20svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7Tess Chu
2007-11-15svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer ...Tess Chu
2007-11-15svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6Tess Chu
2007-10-17QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-02Merge down from Branch_1-18-1:Monroe Williams
2007-06-29revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into r...Don Kjer
2007-06-29Changes to make Logitech code more LL Code Standards compliant, plus remove a...Jake Simpson
2007-05-26land mozilla-https-fix branch, -> releaseAdam Moss
2007-05-08Removing Logitech LCD code: svn merge -r 60616:60615 svn+ssh://svn/svn/linden...Don Kjer
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-04-18svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jake...Jake Simpson
2007-01-02Print done when done.James Cook