summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Expand)Author
2010-09-27MergeLeyla Farazha
2010-09-03Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Li...Aimee Linden
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-09-22mergeRichard Linden
2010-09-16popup blocking notifications now handled in all web_browser instances, not ju...Richard Linden
2010-09-16STORM-122 FIXED Clean up obsolete floaters and related dead codeAimee Linden
2010-09-16refactored notification template into own header fileRichard Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
2010-08-24merge heads. whew.Tofu Linden
2010-08-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-04deprecated ADD_SORTED due to n^2 behavior, set the sort order on the scroll l...Richard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-06-25Merged from viewer-releaseDessie Linden
2010-06-22EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startupRichard Linden
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-21Merge with q/viewer-releaseLeyla Farazha
2010-06-15apply resolution cleanupLeyla Farazha
2010-06-15removing fullscreen functionalityLeyla Farazha
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-08EXT-6655 Fixed Made the default busy message repsonse localizable with alread...Andrew Dyukov
2010-06-04merge from viewer-publicTofu Linden
2010-06-03mergeRichard Linden
2010-06-03EXT-6384 FIXED check to disable 'Adult' setting when agent is not godlike but...Sergei Litovchuk
2010-06-03merge from viewer-publicTofu Linden
2010-06-02eliminated several warnings on startupRichard Linden
2010-05-20Strip out debug code related to toggling display names on/offJames Cook
2010-05-19Fix name tag update when prefs appliedJames Cook
2010-05-19DEV-50013 More SLID to Username renamesJames Cook
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-12DEV-50013 Add "Turning off Display Names" preferenceLeyla Farazha
2010-05-12merge from viewer-publicTofu Linden
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-10Automated MergeRoxie Linden
2010-05-07DEV-49780 Moved Display Names debug toggle to Advanced PrefsJames Cook
2010-05-07DEV-49780 Update name tags when "Show SLIDs" pref disabledJames Cook
2010-05-06mergeTofu Linden
2010-05-05EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by MossKarl Stiefvater (qarl)
2010-05-04EXT-7168Tofu Linden
2010-04-19automated merge with trunkRoxie Linden
2010-04-07Automated mergeRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-09merge from viewer-trunkTofu Linden
2010-04-07mergeVadim Savchuk
2010-04-07Fixed major bug EXT-6661 (chat log paths reset back to default)Mike Antipov
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07mergeTofu Linden