summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-22mergeRichard Linden
2010-09-16popup blocking notifications now handled in all web_browser instances, not ↵Richard Linden
just llfloatermediabrowser
2010-09-16STORM-122 FIXED Clean up obsolete floaters and related dead codeAimee Linden
Removed obsolete XUI files: floater_activeim.xml floater_customize.xml floater_device_settings.xml floater_first_time_tip.xml floater_im.xml floater_my_friends.xml floater_outfit_save_as.xml floater_preview_classified.xml floater_preview_event.xml floater_preview_gesture_info.xml floater_preview_gesture_shortcut.xml floater_preview_gesture_steps.xml floater_statistics.xml floater_wearable_save_as.xml panel_audio_device.xml panel_friends.xml panel_groups.xml panel_nearby_chat.xml panel_online_status.xml panel_region_general_layout.xml Killed obsolete LLFloaterVoiceDeviceSettings class, and moved LLPanelVoiceDeviceSettings into its own appropriately named files.
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
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-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 ↵Richard Nelson
list instead
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-07-30deprecated LLPanel::child*() methodsRichard Nelson
2010-06-25Merged from viewer-releaseDessie Linden
2010-06-25Merged from viewer-releaseDessie Linden
2010-06-22EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startupRichard Linden
reviewed by Leyla
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-21Merge from ssh://hg.lindenlab.com/dessie/viewer-releaseLeyla Farazha
2010-06-15apply resolution cleanupLeyla Farazha
2010-06-15removing fullscreen functionalityLeyla Farazha
reviewed by richard cc#212
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-08EXT-6655 Fixed Made the default busy message repsonse localizable with ↵Andrew Dyukov
already existing account settings - The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same. - To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message. - Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse"). Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run. Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/ --HG-- branch : product-engine
2010-06-04merge from viewer-publicTofu Linden
2010-06-04merge from viewer-publicTofu Linden
2010-06-03EXT-6384 FIXED check to disable 'Adult' setting when agent is not godlike ↵Sergei Litovchuk
but has admin menu enabled. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/508/ --HG-- branch : product-engine
2010-06-03merge from viewer-publicTofu Linden
2010-06-03merge from viewer-publicTofu Linden
2010-06-02eliminated several warnings on startupRichard Linden
2010-05-12merge from viewer-publicTofu Linden
2010-05-12merge from viewer-publicTofu Linden
2010-05-10Automated MergeRoxie Linden
2010-05-06mergeTofu Linden
2010-05-06mergeTofu Linden
2010-05-05EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by MossKarl Stiefvater (qarl)
(changes name of setting WindowFullScreen to FullScreen per discussion in jira.)
2010-05-04EXT-7168Tofu Linden
Fix the tying of the deferred prefs UI to the featuretable.
2010-05-04EXT-7168Tofu Linden
Fix the tying of the deferred prefs UI to the featuretable.
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-09merge from viewer-trunkTofu Linden
2010-04-07mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-07Fixed major bug EXT-6661 (chat log paths reset back to default)Mike Antipov
* Removed unused InstantMessageLogFolder * Restored initializing logic of InstantMessageLogPath value from 1.23 to share setting between viewers. * Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid removing of them in 2.0 * Restored default value of the "Save local chat log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was: LogChat) Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/ --HG-- branch : product-engine
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07mergeTofu Linden
2010-04-07Fixed normal bug EXT-6600(Block List button in Preferences does nothing ↵Eugene Mutavchi
prior to login (should be disabled)) - added disabling of Block List button if user is not logged in. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/186/ --HG-- branch : product-engine