summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2010-04-21mergeTofu Linden
2010-04-21Show beta grids depending on a settings.xml setting. for SLE, this will be ↵Roxie Linden
turned off. For trunk, it's turned on. Also, fixed an issue with manual entry of locations into the location dropdown.
2010-04-20Disabling Watchdog TimeoutMark Palange (Mani)
2010-04-20fix for EXT-4082 Normal Uploading huge image crashes viewerYuri Chebotarev
https://codereview.productengine.com/secondlife/r/11/ reviewed Tofu Linden --HG-- branch : product-engine
2010-04-19automated merge with trunkRoxie Linden
2010-04-14Fixed critical bug EXT-6847 (Default configuration has Away Timeout set to ↵Mike Antipov
"Never") Reason: changeset 97654b5b6313 for EXT-4843 [NUX] Set default Preferences. Setting was reset to 0. Fix: restored default value 300. Also updated setting's description with supported combobox values (0, 120, 300, 600, 1800) Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/234/ --HG-- branch : product-engine
2010-04-13Completed normal subtask EXT-6621 (Code cleanup: Remove unused ↵Mike Antipov
LLFloaterActiveSpeakers and related classes from viewer) * Removed llfloateractivespeacker.h/cpp from CMakeLists.txt and from the repo. * Removed llmediaremotectrl.h/cpp, llvoiceremotectrl.h/cpp from the repo (were not in CMakeLists.txt). * Unused in 2.0 setings ("ShowVoiceChannelPopup" & "ShowVolumeSettingsPopup") are moved to the end of settings.xml (to not affect 1.23 if remove). * Removed xml files related to Active Speakers floater and old Communication floater (related cpp files have been already removed). Also removed their localized versions. * Also removed old textures related to removed xml and unused in 2.0 anymore. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/226/ --HG-- branch : product-engine
2010-04-13mergeVadim Savchuk
--HG-- branch : product-engine
2010-04-13Fixed normal bug EXT-6034 (Need "View People Icons" option for group IM ↵Eugene Mutavchi
window) - added new menu item to participant list menu for group and ad-hoc chats. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/225/. --HG-- branch : product-engine
2010-04-13PE merge from PE's viewer-trunkTofu Linden
2010-04-13Fixed normal bug EXT-5973 (converstations button flash count and rate needs ↵Mike Antipov
to be controllable) Made flashing count and period for IM Well and Notification Well icons configurable via viewer settings: WellIconFlashCount, WellIconFlashPeriod. Due to Flash Timer is implemented as derived class from EventTimer it is impossible to change period in runtime. So, both settings are made as required restart. Also removed deprecated "flash_to_lit_count" & "flash_period" widget params. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/220/ --HG-- branch : product-engine
2010-04-12(slightly hairy) merge from viewer-hotfixTofu Linden
2010-04-07Automated mergeRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Default show SLID on for nowJames Cook
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/ (transplanted from 43297b92c1bb7487dab6610bea61acac4c355878)
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-07Backed out changeset 63b699f90efdTofu Linden
2010-04-15EXT-6847 : Deafult configuration has Away timeout set to "Never"Loren Shih
Imported from 2.1 into 2.0.1. This fix is a safe change and gives Residents useful information about why an avatar is a cloud (e.g. because the avatar minimized his window and hence is "away").
2010-04-02Fixed normal bug EXT-6673 (Default sort order of Nerby People list should be ↵Eugene Mutavchi
by most recent speaker) - corrected the default setting for nearby people sort order. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/175/. --HG-- branch : product-engine
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01mergeRichard Nelson
2010-04-01MergeLeyla Farazha
2010-04-01EXT-5168 prefs review: Remove "Small nametags" optionLeyla Farazha
reviewed by Richard cc#176
2010-04-01mergeRichard Nelson
2010-03-31Merge to sync to viewer 2.0 finalJames Cook
2010-03-30EXT-6525 - drag threshold is very low for navbar favoritesRichard Nelson
reviewed by Leyla
2010-03-29Default MediaShowOnOthers setting to false.Monroe Linden
--HG-- branch : EXT-4880
2010-03-29Merge latest viewer-hotfix, approximately equal to Viewer 2.0 finalJames Cook
2010-03-29Automated mergeRoxie Linden
2010-03-29Fix initial outfit selection dialog to choose initial outfit based onRoxie Linden
what's passed up from login.cgi instead of just using hardcoded values. If nothing is passed up, it defaults to values in settings.xml
2010-03-29EXT-6515 Turn off Vivox automatic crash reportingAimee Linden
2010-04-08Enabling Watchdog.Mark Palange (Mani)
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-19Merge with tipCallum Prentice
2010-03-18Merge of PE merge with extra headKent Quirk
2010-03-18EXT-6466 "Move "Enable Cookies" checkbox...", EXT-6402 "Add feature to ↵Callum Prentice
disable Web plugins via prefs" and EXT-6401 "Add feature to disable Javascript via prefs" Apologies for the multiple commit of Jiras - these changes are closely related and impossible to commit deparately Reviewed by Monroe
2010-03-18set default viewer window size to 1024x738 EXT-4820 [NUX] Viewer dimensions ↵Igor Borovkov
on first-run Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/69/ --HG-- branch : product-engine
2010-03-08automated mergeRoxie Linden
2010-03-08Simplify name tag prefs and put SLID on top of display nameJames Cook
2010-03-08Merge with viewer 2 beta 4James Cook
2010-03-08Enable auto-posting of SLVoice crash logs to VivoxAimee Linden
2010-03-05merge.Tofu Linden
2010-03-05Backed out changeset ede35a3eda50 - restore EXT-5891Tofu Linden
The specs contradict themselves and I *like* this interpretation better.
2010-03-04Fix for EXT-5935Monroe Linden
Decrease PluginInstancesCPULimit default value from 1.0 to 0.9.
2010-03-04Backed out changeset 3ed4974eb9caTofu Linden
was: EXT - 5891 (Login location defaults to My Home) backing this out because, although it sucks, it's per-spec :/
2010-03-03Fixed major bug EXT - 5891 (Login location defaults to My Home)Paul Guslisty
--HG-- branch : product-engine
2010-03-02MergeJames Cook