summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
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-15apply resolution cleanupLeyla Farazha
2010-06-15removing fullscreen functionalityLeyla Farazha
reviewed by richard cc#212
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-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-02eliminated several warnings on startupRichard Linden
2010-05-12merge from viewer-publicTofu Linden
2010-05-10Automated MergeRoxie 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-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
--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
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-02Manual merge from default branch.Vadim Savchuk
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357. --HG-- branch : product-engine
2010-04-02PE mergeTofu Linden
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-01EXT-5168 prefs review: Remove "Small nametags" optionLeyla Farazha
reviewed by Richard cc#176
2010-04-01Fixed bug EXT-6337 (Changing maturity settings in preferences floater only ↵Vadim Savchuk
works on first floater spawn when account is not age verified). I'm actually copying an existing fix from the viewer-hotfix branch. See the ticket for more details. Not reviewed. --HG-- branch : product-engine
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-18Fix for EXT-6304: Shared media cookies cannot be deleted via PreferencesMonroe Linden
Added static member functions to LLViewerMedia: clearAllCookies(), clearAllCaches(), setCookiesEnabled(), and setProxyConfig(). These iterate through all loaded instances and send appropriate messages. Also added a hack to clearAllCookies() to delete cookie files for all accounts, which should serve until we centralize cookie storage. Made LLViewerMedia set the proxy config properly when creating new instances. Callum is adding code to do something similar with the cookies enabled flag in a separate commit. Removed get_web_media from llfloaterpreference.cpp and reworked everything that used it to use the new LLViewerMedia functions instead. Reviewed by Callum at http://codereview.lindenlab.com/838003.
2010-03-17fixed EXT-6284 ([HARD CODED] - Menu Einstellungen, Tab Erweitert: ↵Igor Borovkov
"MiddleMouse" needs to be localized) Control value is preserved, it is being localized on presentation Reviewed by Richard at https://codereview.productengine.com/secondlife/r/24/ --HG-- branch : product-engine
2010-03-08automated mergeRoxie Linden
2010-03-05Fixed (EXT-4704) Add maturity icons to Prefs -> General.Sergei Litovchuk
- Added icons updating upon opening Prefs -> General panel. --HG-- branch : product-engine
2010-03-04fixed reopened EXT-4131 [BSI] "Only friends and groups can call or IM me" ↵Igor Borovkov
NEEDS auto-response --HG-- branch : product-engine
2010-03-03Fixed normal bug EXT-5885 ([HARD CODED] - The busy response should be ↵Andrew Dyukov
localized. hard coded in llviewermessage.cpp). - It wasn't hardcoded in llviewermessage.cpp, but xml which contains it is not localizable. Added string with default busy message to strings.xml and used it in LLFloaterPreference::cleanupBadSetting(). --HG-- branch : product-engine
2010-02-24Implemented (EXT-4704) Add maturity icons to Prefs -> General.Sergei Litovchuk
--HG-- branch : product-engine
2010-02-24Fixed normal bug EXT-5512 (Change in text size for already written chat is ↵Eugene Mutavchi
not updated. Only affects new chat) --HG-- branch : product-engine
2010-02-18PE merge.Tofu Linden
2010-02-18EXT-5461: Reverting change 49e628c3a0c5.Lynx Linden
Renaming skins/base back to skins/default to unblock I10n. Revert was requested by Q.
2010-02-18mergeVadim Savchuk
--HG-- branch : product-engine
2010-02-18Fixed low bug EXT-4057 - Preferences: Draw Distance value of < 100 displays ↵Dmitry Zaporozhan
without an "m". Removed redundant code, there is no DrawDistanceMeterText1 so no need to switch visibility. --HG-- branch : product-engine
2010-02-17Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfixChuck Linden
2010-02-17mergeRichard Linden
2010-02-17EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds corrupts ↵Richard Linden
1.23s UI reviewed by Leyla
2010-02-17EXT-5272: move prefs out of nearby mediaRick Pasetto
Review #114 This (mostly XUI) change moves the prefs checkboxes out of the nearby media panel and into the prefs floater. The "Sound" tab is now the "Sound & Media" tab, and its layout has been modified drastically to match https://docs.google.com:443/a/lindenlab.​com/Doc?id=ddznhrqn_34kcxdz8f3#​Preferences
2010-02-17EXT-4843 [NUX] Set default PreferencesTofu Linden
'General' pane
2010-02-16 EXT-618 Low/Mid/High response is broken in Preferences > Graphicsangela
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 02:20:31 +0000