summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
2011-04-06Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-04-06Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2Richard Linden
2011-04-06WEB-3750 FIX - Gone profileLeslie Linden
* Added agent validation around calls to update avatar data * Removed references to profile panel save options Reviewed by Richard
2011-04-01pull latest changes from viewer-autobuild2010Oz Linden
2011-03-31MergeKelly Washington
2011-02-08merge up to latest viewer-developmentOz Linden
2011-01-27STORM-513 FIXED "Allow media to auto - play" check-box is enable after Media ↵paul_productengine
check-box was unchecked - Disabling "Allow Media to auto play" check box only when both "Streaming Music" and "Media" are unchecked
2011-01-13merge up to latest viewer-developmentOz Linden
2011-01-07merge changes for storm-34Oz Linden
2010-12-23STORM-34 ADDITIONAL_FIX Made saving favorites in file per-account preference ↵Andrew Productengine
instead of per-machine. - Made changes in code of floater preferences and panel login that were required because of turning the setting per-account. - Added new method to LLFloaterPreference that looks for current user's record in saved favorites file and removes it.
2010-12-22Merge with tip of viewer-developmentcallum
2010-12-14Automated merge with file:///Users/oz/Work/viewer-developmentOz Linden
2010-12-09Social-166prep
2010-12-08STORM-584 ADDITIONAL FIX When the user sets the opacity for the name tag the ↵Seth ProductEngine
selected opacity is shown in the color swatch to the left. Fixed color swatch label and tooltip. Added toolltip to opacity slider.
2010-12-07more merge from viewer-developmentBrad Payne (Vir Linden)
2010-12-07merge viewer-development into web-profilesBrad Payne (Vir Linden)
2010-12-06STORM-34 FIXED Saving of user's favorites into file and showing them in ↵Andrew Productengine
"Start at" combobox on login screen was implemented. Implementation details: - File is saved on exit from viewer and not immediately on changes as was written in spec. It is done to make this file consistent with favorites order: order of favorites is saved on exit, so if favorites info is saved in other moment earlier, crashing viewer or other unexpected way of finishing its work (i.e. via Windows task bar) would cause inconsistence between favorites order saved per account and one from this new file. - File is saved in user_settings\stored_favorites.xml. - If you uncheck the option in Preferences and press OK, the file gets immediately deleted (according to spec). Issues that require further changes: - Currently only favorites of last logged in user are shown in login screen. Showing favorites of multiple users will be implemented later when design for it is approved by Esbee. - Preference is now global for all users, because design states it may be changed before login, and we don't have account info at the moment. But it doesn't seem to be a good idea, so changes in design are needed. - Currently the way of retrieving SLURLs needs optimization in a separate ticket. More detailed design approved by Esbee is needed to develop it further, perhaps in new tickets.
2010-12-04merge up to viewer-developmentOz Linden
2010-11-22WIP avatar properties persist from preference windowprep linden
2010-11-22STORM-517 FIXED Warn user that language change will only take effect after ↵Vadim ProductEngine
restarting viewer. The warning is shown only once (until the preferences floater is reopened).
2010-11-18misc cleanupprep linden
2010-11-18Move include in search results from profile window to preference privacy paneprep linden
2010-11-18STORM-576 FIXED Hooked up code to preference that allows users to enable ↵Andrew Productengine
double-click to teleport or use auto-pilot. - Added dirty flag that is set true when user changes checkbox or chooses one of radiobuttons connected to double-click action. No change of user settings happens on this commit, because user may press cancel or close floater. If user presses OK, and flag is true, user changes are applied to settings. If user clicks cancel or closes floater, controls are reverted to the state they were before changes, using settings to determine it. - Removed double-click action menu items and code that handled them to avoid functionality duplication and synchronization problems.
2010-11-11STORM-102: Merge from viewer-developmentWolfpup Lowenhar
2010-11-08EXP-421 FIX Notifications tab in Preferences not working properlyRichard Linden
fixed logic so that ignore consistently means *don't show* the notification the ignore settings still store "show the notification if true" values
2010-10-26This is the setting of the core file name date stamp code and settings ↵Wolfpup Lowenhar
files for Chat, Group and IM Logs. --HG-- branch : storm-102
2010-10-12MergeLeyla Farazha
2010-09-27MergeLeyla Farazha
2010-09-29STORM-227 FIXED Made long cache location in Preferences->Setup readable.Vadim ProductEngine
Changes: - The line editor is now scrollable. - Its value is duplicated in the tool-tip. Technical notes: If you set the "enabled" param of a line editor to "false", that will disable text selection in the widget. However, if a line editor is initially enabled and then gets disabled with setEnabled(FALSE), it will remain selectable. It looks like bug, but I'm not going to fix it now to not introduce issues like this one. Instead, I'm applying to workaround which is to enable the widget initially and disable later, thus keeping it read-only but selectable.
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
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 ↵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-26Added graphics preference setting for physics.Loren Shih
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-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
reviewed by Leyla
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